Skip to content

Commit

Permalink
fix(nsis): Do not abort when uninstaller fails (#5292)
Browse files Browse the repository at this point in the history
Do not abort installation when the uninstaller is missing, fails to run or returns error code.
  • Loading branch information
o2genum authored Sep 17, 2020
1 parent fca50ae commit ea9281b
Showing 1 changed file with 1 addition and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -179,18 +179,14 @@ Function uninstallOldVersion
ifErrors 0 ExecErrorHandler
# this also failed...
DetailPrint `Aborting, uninstall was not successful. Not able to launch uninstaller!`
SetErrorLevel 5
Abort "Cannot uninstall"
ExecErrorHandler:
${if} $R0 != 0
DetailPrint `Aborting, uninstall was not successful. Uninstaller error code: $R0.`
SetErrorLevel 5
Abort "Cannot uninstall"
${endif}
Done:
FunctionEnd

!macro uninstallOldVersion ROOT_KEY
Push "${ROOT_KEY}"
Call uninstallOldVersion
!macroend
!macroend

0 comments on commit ea9281b

Please sign in to comment.