Apply the suggestions from @Ash258

nrolando46 · Jun 9, 2020 · 91ea657 · 91ea657
1 parent 3188115
commit 91ea657
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/bin/uninstall.ps1 b/bin/uninstall.ps1
@@ -49,8 +49,8 @@ function do_uninstall($app, $global) {
     # directory.
     $refdir = unlink_current (appdir $app $global)
 
-    env_rm_path $manifest $refdir $global
-    env_rm $manifest $global
+    env_rm_path $manifest $refdir $global $architecture
+    env_rm $manifest $global $architecture
 
     $appdir = appdir $app $global
     try {

diff --git a/libexec/scoop-reset.ps1 b/libexec/scoop-reset.ps1
@@ -74,7 +74,7 @@ $apps | ForEach-Object {
     create_shims $manifest $dir $global $architecture
     create_startmenu_shortcuts $manifest $dir $global $architecture
     env_add_path $manifest $dir $global $architecture
-    env_set $manifest $dir $global
+    env_set $manifest $dir $global $architecture
     # unlink all potential old link before re-persisting
     unlink_persist_data $original_dir
     persist_data $manifest $original_dir $persist_dir

diff --git a/libexec/scoop-uninstall.ps1 b/libexec/scoop-uninstall.ps1
@@ -86,8 +86,8 @@ if (!$apps) { exit 0 }
 
     uninstall_psmodule $manifest $refdir $global
 
-    env_rm_path $manifest $refdir $global
-    env_rm $manifest $global
+    env_rm_path $manifest $refdir $global $architecture
+    env_rm $manifest $global $architecture
 
     try {
         # unlink all potential old link before doing recursive Remove-Item

diff --git a/libexec/scoop-update.ps1 b/libexec/scoop-update.ps1
@@ -252,8 +252,8 @@ function update($app, $global, $quiet = $false, $independent, $suggested, $use_c
     write-host "Uninstalling '$app' ($old_version)"
     run_uninstaller $old_manifest $architecture $dir
     rm_shims $old_manifest $global $architecture
-    env_rm_path $old_manifest $dir $global
-    env_rm $old_manifest $global
+    env_rm_path $old_manifest $dir $global $architecture
+    env_rm $old_manifest $global $architecture
 
     # If a junction was used during install, that will have been used
     # as the reference directory. Otherwise it will just be the version