From 709882a499b4fd65cecf51b3ea894c1a6e96db50 Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Thu, 5 May 2022 11:16:03 +0200
Subject: [PATCH 1/2] do_zip variable has disappeared, fixing that

---
 mk.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mk.py b/mk.py
index c2e034c..e5ba8f1 100644
--- a/mk.py
+++ b/mk.py
@@ -10,6 +10,9 @@ from assets.tools import exec, patch
 #
 
 
+do_zip = False
+
+
 def deps_win32():
     exec('rustup target add i686-pc-windows-msvc')
 
@@ -151,7 +154,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))

From 35bd388d25cfa19ef2f1ef809f2a382ff8b47309 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Malte=20J=C3=BCrgens?= <maltejur@dismail.de>
Date: Thu, 5 May 2022 17:36:49 +0200
Subject: [PATCH 2/2] Ask user before closing LibreWolf in installer

---
 assets/setup.nsi | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

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