Changed global install of PowerShell modules to $globaldir\Modules

ScoopInstaller · Aug 22, 2023 · 044d076 · 044d076
1 parent 32f4350
commit 044d076
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 14 deletions.
diff --git a/lib/core.ps1 b/lib/core.ps1
@@ -264,6 +264,7 @@ function filesize($length) {
 function basedir($global) { if($global) { return $globaldir } $scoopdir }
 function appsdir($global) { "$(basedir $global)\apps" }
 function shimdir($global) { "$(basedir $global)\shims" }
+function modulesdir($global) { "$(basedir $global)\modules" }
 function appdir($app, $global) { "$(appsdir $global)\$app" }
 function versiondir($app, $version, $global) { "$(appdir $app $global)\$version" }
 

diff --git a/lib/psmodules.ps1 b/lib/psmodules.ps1
@@ -1,16 +1,10 @@
-$modulesdir = "$scoopdir\modules"
-$globalmodulesdir = "$env:ProgramFiles\WindowsPowerShell\Modules" # https://learn.microsoft.com/en-us/powershell/module/microsoft.powershell.core/about/about_psmodulepath
-
 function install_psmodule($manifest, $dir, $global) {
     $psmodule = $manifest.psmodule
     if (!$psmodule) { return }
 
-    if ($global) {
-        $targetdir = ensure $globalmodulesdir
-    } else {
-        $targetdir = ensure $modulesdir;
-        ensure_in_psmodulepath $modulesdir $global
-    }
+    $targetdir = ensure (modulesdir $global)
+
+    ensure_in_psmodulepath $targetdir $global
 
     $module_name = $psmodule.name
     if (!$module_name) {
@@ -37,11 +31,7 @@ function uninstall_psmodule($manifest, $dir, $global) {
     $module_name = $psmodule.name
     Write-Host "Uninstalling PowerShell module '$module_name'."
 
-    if ($global) {
-        $targetdir = ensure $globalmodulesdir
-    } else {
-        $targetdir = ensure $modulesdir;
-    }
+    $targetdir = modulesdir $global
 
     $linkfrom = "$targetdir\$module_name"
     if (Test-Path $linkfrom) {