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.

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(windows-installer): uninstall script behavior #822

Merged
merged 1 commit into from
Feb 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 msi-builder/FinchMSITemplate.wxs
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
<ComponentRef Id="Component_Roofts" />
</ComponentGroup>
<CustomAction Id="RunPostInstallScript" FileKey="postinstall_bat" ExeCommand="&quot;[INSTALLFOLDER]&quot;" Return="check" Execute="deferred" Impersonate="no" />
<CustomAction Id="RunUninstallScript" FileKey="uninstall_bat" ExeCommand="&quot;[INSTALLFOLDER]&quot;" Execute="deferred" Return="ignore" Impersonate="no" />
<CustomAction Id="RunUninstallScript" FileKey="uninstall_bat" ExeCommand="&quot;[INSTALLFOLDER]&quot;" Execute="deferred" Return="ignore" Impersonate="yes" />
<InstallExecuteSequence>
<RemoveExistingProducts After="InstallInitialize" />
<Custom Action="RunPostInstallScript" After="InstallFiles">NOT Installed</Custom>
Expand Down
6 changes: 3 additions & 3 deletions msi-builder/uninstall.bat
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
SET InstallDir=%~1

:: Stop and remove any running instance
finch.exe vm stop -f
finch.exe vm remove -f
finch.exe vm stop -f ^ &
finch.exe vm remove -f ^ &

:: Just in case
wsl --terminate lima-finch
wsl --terminate lima-finch ^ &
wsl --unregister lima-finch

:: Delete files and directories if they exist
Expand Down
Loading