Merge branch 'develop' into feat-isolate-path

ScoopInstaller · Apr 1, 2024 · 945a97c · 945a97c
2 parents 65c5f48 + dfbeace
commit 945a97c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -59,7 +59,7 @@
 - **git:** Use Invoke-Git() with direct path to git.exe to prevent spawning shim subprocesses ([#5122](https://github.com/ScoopInstaller/Scoop/issues/5122), [#5375](https://github.com/ScoopInstaller/Scoop/issues/5375))
 - **scoop-download:** Output more detailed manifest information ([#5277](https://github.com/ScoopInstaller/Scoop/issues/5277))
 - **core:** Cleanup some old codes, e.g., msi section and config migration ([#5715](https://github.com/ScoopInstaller/Scoop/issues/5715), [#5824](https://github.com/ScoopInstaller/Scoop/issues/5824))
-- **core:** Rewrite and separate path-related functions to `system.ps1` ([#5836](https://github.com/ScoopInstaller/Scoop/issues/5836))
+- **core:** Rewrite and separate path-related functions to `system.ps1` ([#5836](https://github.com/ScoopInstaller/Scoop/issues/5836), [#5858](https://github.com/ScoopInstaller/Scoop/issues/5858))
 
 ### Builds
 

diff --git a/lib/system.ps1 b/lib/system.ps1
@@ -57,7 +57,9 @@ function Set-EnvVar {
     }
     $envRegisterKey = $registerKey.OpenSubKey('Environment', $true)
     if ($null -eq $Value -or $Value -eq '') {
-        $envRegisterKey.DeleteValue($Name)
+        if ($envRegisterKey.GetValue($Name)) {
+            $envRegisterKey.DeleteValue($Name)
+        }
     } else {
         $registryValueKind = if ($Value.Contains('%')) {
             [Microsoft.Win32.RegistryValueKind]::ExpandString