From 81ad387c9e61d867f61083df945ab3bd83dad125 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20=C4=8C=C3=A1bera?= Date: Sat, 30 May 2020 15:50:48 +0200 Subject: [PATCH] fix(env_add_path): Architecutre specific handling --- .vscode/Cosi.code-workspace | 1 - lib/uninstall.ps1 | 4 ++-- libexec/scoop-reset.ps1 | 5 +++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.vscode/Cosi.code-workspace b/.vscode/Cosi.code-workspace index b660cb278d..b75e85927c 100644 --- 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 index c65c102952..b6d695d839 100644 --- 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 index 52fb78322e..92baf92841 100644 --- 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