Skip to content

fix(env): Avoid automatic expansion of %% in env #5395

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
niheaven merged 11 commits into from
Feb 25, 2023
Merged

fix(env): Avoid automatic expansion of %% in env #5395

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
3c26bf9
fix(scoop-update): Avoid `%` substitutions in env
WHYBBE Feb 20, 2023
c84214d
fix(scoop-update): Update the method to set env
WHYBBE Feb 20, 2023
f81448b
fix(scoop-update): Remove unused variables
WHYBBE Feb 20, 2023
934ebb4
fix(env): Use the method of C# to get/set env
WHYBBE Feb 21, 2023
f8ea19b
fix(env): Keep the original env type
WHYBBE Feb 21, 2023
b46765a
Simplify function
rashil2000 Feb 21, 2023
106fc65
fix(env): Update CHANGELOG.md
WHYBBE Feb 22, 2023
0c77540
fix(env): Merge 'origin/develop' into patch-1
WHYBBE Feb 22, 2023
0adaee4
fix(env): Update CHANGELOG.md in right place
WHYBBE Feb 22, 2023
34408de
fix(env): Add empty check, add `%` judgment
WHYBBE Feb 24, 2023
bc1d22f
Merge branch 'develop' into patch-1
niheaven Feb 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
- **autoupdate:** Fix file hash extraction ([#5295](https://github.com/ScoopInstaller/Scoop/issues/5295))
- **shortcuts:** Output correctly formatted path ([#5333](https://github.com/ScoopInstaller/Scoop/issues/5333))
- **core:** Fix `is_in_dir` under Unix ([#5391](https://github.com/ScoopInstaller/Scoop/issues/5391))
- **env:** Avoid automatic expansion of `%%` in env ([#5394](https://github.com/ScoopInstaller/Scoop/issues/5394))

### Code Refactoring

Expand Down
27 changes: 23 additions & 4 deletions lib/core.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -662,10 +662,29 @@ function Invoke-ExternalCommand {
return $true
}

function env($name,$global,$val='__get') {
$target = 'User'; if($global) {$target = 'Machine'}
if($val -eq '__get') { [environment]::getEnvironmentVariable($name,$target) }
else { [environment]::setEnvironmentVariable($name,$val,$target) }
function env($name, $global, $val = '__get') {
$RegisterKey = if ($global) {
Get-Item -Path 'HKLM:\SYSTEM\CurrentControlSet\Control\Session Manager'
} else {
Get-Item -Path 'HKCU:'
}
$EnvRegisterKey = $RegisterKey.OpenSubKey('Environment', $val -ne '__get')

if ($val -eq '__get') {
$RegistryValueOption = [Microsoft.Win32.RegistryValueOptions]::DoNotExpandEnvironmentNames
$EnvRegisterKey.GetValue($name, $null, $RegistryValueOption)
} elseif ($val -eq $null) {
$EnvRegisterKey.DeleteValue($name)
} else {
$RegistryValueKind = if ($val.Contains('%')) {
[Microsoft.Win32.RegistryValueKind]::ExpandString
} elseif ($EnvRegisterKey.GetValue($name)) {
$EnvRegisterKey.GetValueKind($name)
} else {
[Microsoft.Win32.RegistryValueKind]::String
}
$EnvRegisterKey.SetValue($name, $val, $RegistryValueKind)
}
}

function isFileLocked([string]$path) {
Expand Down
⚡