Code refactor

Author: niheaven

CHANGELOG.md

@@ -3,6 +3,7 @@
 
 ### Features
 
+- **config:** Allow Scoop to ignore running processes during reset/uninstall/update ([#4713](https://github.com/ScoopInstaller/Scoop/issues/4713))
 - **scoop-download:** Add `scoop download` command ([#4621](https://github.com/ScoopInstaller/Scoop/issues/4621))
 - **scoop-(install|virustotal):** Allow skipping update check ([#4634](https://github.com/ScoopInstaller/Scoop/issues/4634))
 - **scoop-bucket:** List more detailed information for buckets ([#4704](https://github.com/ScoopInstaller/Scoop/pull/4704))
@@ -14,7 +15,6 @@
 - **autoupdate:** Allow checksum file that contains whitespaces ([#4619](https://github.com/ScoopInstaller/Scoop/issues/4619))
 - **autoupdate:** Rename $response to $res ([#4706](https://github.com/ScoopInstaller/Scoop/issues/4706))
 - **config:** Allow scoop config use Unicode characters ([#4631](https://github.com/ScoopInstaller/Scoop/issues/4631))
-- **config:** Allow Scoop to ignore running processes during reset/uninstall/update ([#4713](https://github.com/ScoopInstaller/Scoop/issues/4713))
 - **config:** Fix `set_config` bugs ([#3681](https://github.com/ScoopInstaller/Scoop/issues/3681))
 - **current:** Remove 'current' while it's not a junction ([#4687](https://github.com/ScoopInstaller/Scoop/issues/4687))
 - **depends:** Prevent error on no URL ([#4595](https://github.com/ScoopInstaller/Scoop/issues/4595))

lib/install.ps1

@@ -1212,20 +1212,16 @@ function persist_permission($manifest, $global) {
     }
 }
 
-# return $true if running processes do not exist, or are handled by this function
-function handle_running_processes($app, $global) {
-    $processdir = appdir $app $global | Resolve-Path | Select-Object -ExpandProperty Path
+# test if there are running processes
+function test_running_process($app, $global) {
+    $processdir = appdir $app $global | Convert-Path
     $running_processes = Get-Process | Where-Object { $_.Path -like "$processdir\*" }
-    $ret = $true
 
-    if ($running_processes) {
-        $ret = get_config 'ignore_running_processes' $false
-        if ($ret) {
-            warn "Application `"$app`" is still running. Scoop is configured to ignore this condition."
-        } else {
-            error "Application `"$app`" is still running. Close all instances and try again."
-        }
+    if ($running_processes -and !(get_config 'ignore_running_processes')) {
+        error "Application `"$app`" is still running. Close all instances and try again."
+        return $true
+    } else {
+        warn "Application `"$app`" is still running. Scoop is configured to ignore this condition."
+        return $false
     }
-
-    return $ret
 }

libexec/scoop-reset.ps1

@@ -68,7 +68,7 @@ $apps | ForEach-Object {
     $persist_dir = persistdir $app $global
 
     #region Workaround for #2952
-    if (!(handle_running_processes $app $global)) {
+    if (test_running_process $app $global) {
         continue
     }
     #endregion Workaround for #2952

libexec/scoop-uninstall.ps1

@@ -59,7 +59,7 @@ if (!$apps) { exit 0 }
         $persist_dir = persistdir $app $global
 
         #region Workaround for #2952
-        if (!(handle_running_processes $app $global)) {
+        if (test_running_process $app $global) {
             continue
         }
         #endregion Workaround for #2952

libexec/scoop-update.ps1

@@ -231,7 +231,7 @@ function update($app, $global, $quiet = $false, $independent, $suggested, $use_c
     $persist_dir = persistdir $app $global
 
     #region Workaround for #2952
-    if (!(handle_running_processes $app $global)) {
+    if (test_running_process $app $global) {
         return
     }
     #endregion Workaround for #2952