Skip to content

fix(scoop-uninstall): run pre_uninstall before testing running processes #4962

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
chawyehsu merged 5 commits into from
Jun 3, 2022
Merged

fix(scoop-uninstall): run pre_uninstall before testing running processes #4962

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d974b6e
fix(uninstall): pre_uninstall executed before test_running_processes
beer-psi Jun 2, 2022
8cb2566
Update changelog
beer-psi Jun 2, 2022
11025a6
Update CHANGELOG.md
beer-psi Jun 2, 2022
3d9edc6
fix: fetch manifest before invoking pre_uninstall hook
beer-psi Jun 2, 2022
23a6aa6
Update CHANGELOG.md
chawyehsu Jun 3, 2022
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
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

### Features

- **core:** Add pre_uninstall and post_uninstall hooks ([#4957](https://github.com/ScoopInstaller/Scoop/issues/4957))
- **core:** Add pre_uninstall and post_uninstall hooks ([#4957](https://github.com/ScoopInstaller/Scoop/issues/4957), [#4962](https://github.com/ScoopInstaller/Scoop/issues/4962))

### Bug Fixes

Expand Down
12 changes: 6 additions & 6 deletions libexec/scoop-uninstall.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,12 @@ if (!$apps) { exit 0 }
$dir = versiondir $app $version $global
$persist_dir = persistdir $app $global

$manifest = installed_manifest $app $version $global
$install = install_info $app $version $global
$architecture = $install.architecture

Invoke-HookScript -HookType 'pre_uninstall' -Manifest $manifest -Arch $architecture
Comment thread
beer-psi marked this conversation as resolved.

#region Workaround for #2952
if (test_running_process $app $global) {
continue
Expand All @@ -67,12 +73,6 @@ if (!$apps) { exit 0 }
continue
}

$manifest = installed_manifest $app $version $global
$install = install_info $app $version $global
$architecture = $install.architecture

Invoke-HookScript -HookType 'pre_uninstall' -Manifest $manifest -Arch $architecture

run_uninstaller $manifest $architecture $dir
rm_shims $app $manifest $global $architecture
rm_startmenu_shortcuts $manifest $global $architecture
Expand Down
⚡