Skip to content
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

fix(core): Avoid error messages when deleting non-existent environment variable #5547

Merged
merged 7 commits into from
Oct 3, 2023
Merged

fix(core): Avoid error messages when deleting non-existent environment variable #5547

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6b65852
fix(core): Check if the envrionment variable exists before delete
HUMORCE Jun 19, 2023
8387ab9
CHANGELOG
HUMORCE Jun 19, 2023
fa38783
Use `try, catch`, value of env variable may is null/empty
HUMORCE Jun 19, 2023
fa4f56c
UPDATE CHANGELOG
HUMORCE Jun 19, 2023
298ff21
Merge branch 'develop' into delete_env_var
HUMORCE Jun 30, 2023
61f8d73
Merge branch 'develop' into delete_env_var
rashil2000 Oct 3, 2023
106d856
Brackets
rashil2000 Oct 3, 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 @@ -23,6 +23,7 @@
- **install:** Fix download from private GitHub repositories ([#5361](https://github.com/ScoopInstaller/Scoop/issues/5361))
- **scoop-info:** Fix errors in file size collection when `--verbose` ([#5352](https://github.com/ScoopInstaller/Scoop/pull/5352))
- **shim:** Use bash executable directly ([#5433](https://github.com/ScoopInstaller/Scoop/issues/5433))
- **core:** Avoid error messages when deleting non-existent environment variable ([#5547](https://github.com/ScoopInstaller/Scoop/issues/5547))
- **core:** Use relative path as fallback of `$scoopdir` ([#5544](https://github.com/ScoopInstaller/Scoop/issues/5544))
- **scoop-checkup:** Skip defender check in Windows Sandbox ([#5519](https://github.com/ScoopInstaller/Scoop/issues/5519))
- **buckets:** Avoid error messages for unexpected dir ([#5549](https://github.com/ScoopInstaller/Scoop/issues/5549))
Expand Down
2 changes: 1 addition & 1 deletion lib/core.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -751,7 +751,7 @@ function env($name, $global, $val = '__get') {
$RegistryValueOption = [Microsoft.Win32.RegistryValueOptions]::DoNotExpandEnvironmentNames
$EnvRegisterKey.GetValue($name, $null, $RegistryValueOption)
} elseif ($val -eq $null) {
$EnvRegisterKey.DeleteValue($name)
try { $EnvRegisterKey.DeleteValue($name) } catch { }
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Operation of adding, deleting environment variable both no output, so a empty catch block here.

Publish-Env
} else {
$RegistryValueKind = if ($val.Contains('%')) {
Expand Down