Make SCOOP_PATH as default PATH

ScoopInstaller · Apr 13, 2024 · a2b13b3 · a2b13b3
1 parent 412c903
commit a2b13b3
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 46 deletions.
diff --git a/lib/core.ps1 b/lib/core.ps1
@@ -161,42 +161,7 @@ function Complete-ConfigChange {
         [string]
         $Value
     )
-
-    if ($Name -eq 'use_isolated_path') {
-        . "$PSScriptRoot\..\lib\system.ps1"
-
-        if ($Value -eq $true) {
-            info 'Switching to isolated path... This may take a while, please wait.'
-            $movedPath = Remove-Path -Path "$scoopdir\apps\*" -Quiet -PassThru
-            if ($movedPath) {
-                Add-Path -Path $movedPath -TargetEnvVar 'SCOOP_PATH' -Quiet
-                Add-Path -Path '%SCOOP_PATH%' -Quiet
-            }
-            if (is_admin) {
-                $movedPath = Remove-Path -Path "$globaldir\apps\*" -Global -Quiet -PassThru
-                if ($movedPath) {
-                    Add-Path -Path $movedPath -TargetEnvVar 'SCOOP_PATH' -Global -Quiet
-                    Add-Path -Path '%SCOOP_PATH%' -Global -Quiet
-                }
-            }
-        } else {
-            info 'Switching to shared path... This may take a while, please wait.'
-            $movedPath = Get-EnvVar -Name 'SCOOP_PATH'
-            if ($movedPath) {
-                Add-Path -Path $movedPath -Quiet
-                Remove-Path -Path '%SCOOP_PATH%' -Quiet
-                Set-EnvVar -Name 'SCOOP_PATH' -Quiet
-            }
-            if (is_admin) {
-                $movedPath = Get-EnvVar -Name 'SCOOP_PATH' -Global
-                if ($movedPath) {
-                    Add-Path -Path $movedPath -Global -Quiet
-                    Remove-Path -Path '%SCOOP_PATH%' -Global -Quiet
-                    Set-EnvVar -Name 'SCOOP_PATH' -Global -Quiet
-                }
-            }
-        }
-    }
+    # Add needed config change logic here
 }
 
 function setup_proxy() {

diff --git a/lib/install.ps1 b/lib/install.ps1
@@ -906,13 +906,9 @@ function env_add_path($manifest, $dir, $global, $arch) {
     $env_add_path = arch_specific 'env_add_path' $manifest $arch
     $dir = $dir.TrimEnd('\')
     if ($env_add_path) {
-        $target_path = 'PATH'
-        if (get_config USE_ISOLATED_PATH) {
-            Add-Path -Path '%SCOOP_PATH%' -Global:$global
-            $target_path = 'SCOOP_PATH'
-        }
+        Add-Path -Path '%SCOOP_PATH%' -Global:$global
         $path = $env_add_path.Where({ $_ }).ForEach({ Join-Path $dir $_ | Get-AbsolutePath }).Where({ is_in_dir $dir $_ })
-        Add-Path -Path $path -TargetEnvVar $target_path -Global:$global -Force
+        Add-Path -Path $path -TargetEnvVar 'SCOOP_PATH' -Global:$global -Force
     }
 }
 

diff --git a/libexec/scoop-config.ps1 b/libexec/scoop-config.ps1
@@ -115,10 +115,6 @@
 #       Nightly version is formatted as 'nightly-yyyyMMdd' and will be updated after one day if this is set to $true.
 #       Otherwise, nightly version will not be updated unless `--force` is used.
 #
-# use_isolated_path: $true|$false
-#       When set to $true, Scoop will use `SCOOP_PATH` environment variable to store apps' `PATH`s.
-#       This is useful when you want to isolate Scoop from the system `PATH`.
-#
 # ARIA2 configuration
 # -------------------
 #

diff --git a/libexec/scoop-update.ps1 b/libexec/scoop-update.ps1
@@ -57,6 +57,22 @@ if(($PSVersionTable.PSVersion.Major) -lt 5) {
 }
 $show_update_log = get_config SHOW_UPDATE_LOG $true
 
+# Migrate PATH EnvVar to SCOOP_PATH
+$movedPath = Remove-Path -Path "$scoopdir\apps\*" -Quiet -PassThru
+if ($movedPath) {
+    info 'Switching to isolated path... This may take a while, please wait.'
+    Add-Path -Path $movedPath -TargetEnvVar 'SCOOP_PATH' -Quiet
+    Add-Path -Path '%SCOOP_PATH%' -Quiet
+}
+if (is_admin) {
+    $movedPath = Remove-Path -Path "$globaldir\apps\*" -Global -Quiet -PassThru
+    if ($movedPath) {
+        info 'Switching to isolated global path... This may take a while, please wait.'
+        Add-Path -Path $movedPath -TargetEnvVar 'SCOOP_PATH' -Global -Quiet
+        Add-Path -Path '%SCOOP_PATH%' -Global -Quiet
+    }
+}
+
 function Sync-Scoop {
     [CmdletBinding()]
     Param (