fix(env_add_path): Architecutre specific handling

Ash258 · May 30, 2020 · 81ad387 · 81ad387 · Ash258 · Aug 27, 2020
1 parent 8a98bee
commit 81ad387
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.vscode/Cosi.code-workspace b/.vscode/Cosi.code-workspace
@@ -154,7 +154,6 @@
         "markdown.extension.list.indentationSize": "inherit",
         "markdown.extension.orderedList.marker": "one",
         "markdown.extension.tableFormatter.enabled": true,
-        "markdown.extension.toc.githubCompatibility": true,
         "markdown.extension.toc.levels": "2..6",
         "powershell.codeFormatting.addWhitespaceAroundPipe": true,
         "powershell.codeFormatting.alignPropertyValuePairs": true,

diff --git a/lib/uninstall.ps1 b/lib/uninstall.ps1
@@ -88,8 +88,8 @@ function Uninstall-ScoopApplication {
     $refdir = unlink_current $dir
 
     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
 
     # Remove older versions
     if ($Older) {

diff --git a/libexec/scoop-reset.ps1 b/libexec/scoop-reset.ps1
@@ -68,8 +68,9 @@ foreach ($a in $apps) {
     $dir = link_current $dir
     create_shims $manifest $dir $global $architecture
     create_startmenu_shortcuts $manifest $dir $global $architecture
-    env_add_path $manifest $dir
-    env_set $manifest $dir $global
+    env_add_path $manifest $dir $global $architecture
+    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