fix: uninstall fails to remove architecture-specific shims (fixes #1191)

Author: lukesampson

bin/uninstall.ps1

@@ -24,7 +24,7 @@ function do_uninstall($app, $global) {
 
     echo "uninstalling $app"
     run_uninstaller $manifest $architecture $dir
-    rm_shims $manifest $global
+    rm_shims $manifest $global $architecture
 
     # If a junction was used during install, that will have been used
     # as the reference directory. Othewise it will just be the version

lib/install.ps1

@@ -589,8 +589,10 @@ function rm_shim($name, $shimdir) {
     }
 }
 
-function rm_shims($manifest, $global) {
-    $manifest.bin | ?{ $_ -ne $null } | % {
+function rm_shims($manifest, $global, $arch) {
+    $shims = @(arch_specific 'bin' $manifest $arch)
+
+    $shims | ?{ $_ -ne $null } | % {
         $target, $name, $null = shim_def $_
         $shimdir = shimdir $global
 

libexec/scoop-uninstall.ps1

@@ -60,7 +60,7 @@ foreach($app in $apps) {
     $architecture = $install.architecture
 
     run_uninstaller $manifest $architecture $dir
-    rm_shims $manifest $global
+    rm_shims $manifest $global $architecture
     rm_startmenu_shortcuts $manifest $global
 
     # If a junction was used during install, that will have been used

libexec/scoop-update.ps1

@@ -131,7 +131,7 @@ function update($app, $global, $quiet = $false, $independent) {
 
     "uninstalling $app ($old_version)"
     run_uninstaller $old_manifest $architecture $dir
-    rm_shims $old_manifest $global
+    rm_shims $old_manifest $global $architecture
     env_rm_path $old_manifest $dir $global
     env_rm $old_manifest $global
     # note: keep the old dir in case it contains user files