diff --git a/assets/setup.nsi b/assets/setup.nsi index ab701fa..d0775ba 100644 --- a/assets/setup.nsi +++ b/assets/setup.nsi @@ -43,7 +43,13 @@ Section SetErrorlevel 2 Abort - DetailPrint "${APPNAME} is still running. Closing it gracefully..." + DetailPrint "${APPNAME} is still running" + MessageBox MB_OKCANCEL "LibreWolf is still running and has to be closed for the setup to continue." IDOK continue IDCANCEL break +break: + SetErrorlevel 1 + Abort +continue: + DetailPrint "Closing ${APPNAME} gracefully..." nsProcess::_CloseProcess "${EXECUTABLE}" Pop $R0 Sleep 2000 diff --git a/mk.py b/mk.py index fcffecc..01ab332 100644 --- a/mk.py +++ b/mk.py @@ -8,6 +8,9 @@ from assets.tools import exec, patch # +do_zip = False + + def deps_win32(): exec('rustup target add i686-pc-windows-msvc') @@ -148,7 +151,6 @@ def artifacts(): exec('cp -v assets/librewolf.ico work/librewolf') # Let's make the portable zip first. - do_zip = True if do_zip: os.chdir('work') exec('rm -rf librewolf-{}'.format(version))