From eeeea8566e3dd281890faf061a4b6d0a0627baae Mon Sep 17 00:00:00 2001
From: Jonas Kvinge <jonas@jkvinge.net>
Date: Sun, 26 Nov 2023 21:35:48 +0100
Subject: [PATCH] nsi: Handle silent uninstall

Fixes #1323
---
 dist/windows/strawberry.nsi.in | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/dist/windows/strawberry.nsi.in b/dist/windows/strawberry.nsi.in
index feb94506..1a5969c8 100644
--- a/dist/windows/strawberry.nsi.in
+++ b/dist/windows/strawberry.nsi.in
@@ -136,8 +136,6 @@ SetCompressor /SOLID lzma
   ReserveFile "${NSISDIR}\Plugins\x86-unicode\INetC.dll"
 !endif
 
-!define LockedListPATH	$InstallDir
-
 ; Installer pages
 !insertmacro MUI_PAGE_WELCOME
 !insertmacro MUI_PAGE_LICENSE COPYING
@@ -184,19 +182,22 @@ FunctionEnd
 Function CheckPreviousInstall
 
   ReadRegStr $R0 ${PRODUCT_UNINST_ROOT_KEY} ${PRODUCT_UNINST_KEY} "UninstallString"
-  StrCmp $R0 "" done
+  StrCmp $R0 "" Done
 
-  MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION \
-  "${PRODUCT_NAME} is already installed. $\n$\nClick `OK` to remove the \
-  previous version or `Cancel` to cancel this upgrade." \
-  IDOK uninst
+${IfNot} ${Silent}
+  MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION "${PRODUCT_NAME} is already installed. $\n$\nClick `OK` to remove the previous version or `Cancel` to cancel this upgrade." IDOK Uninstall
   Abort
-; Run the uninstaller
-uninst:
-  ClearErrors
-  ExecWait '$R0' ; Do not copy the uninstaller to a temp file
+${EndIf}
 
-done:
+  Uninstall:
+  ClearErrors
+  ${If} ${Silent}
+  ExecWait '$R0 /S'
+  ${Else}
+  ExecWait '$R0'
+  ${EndIf}
+
+  Done:
 
 FunctionEnd