From 20bc254a4214aa19781bab28fa2ed70458c3e2e7 Mon Sep 17 00:00:00 2001 From: antelle Date: Sat, 9 Jan 2021 21:52:38 +0100 Subject: [PATCH] fixed windows uninstaller --- package/nsis/check-running.nsh | 1 - package/nsis/main-un.nsi | 1 + package/nsis/main.nsi | 3 +-- package/nsis/variables.nsh | 2 ++ 4 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 package/nsis/variables.nsh diff --git a/package/nsis/check-running.nsh b/package/nsis/check-running.nsh index 92ff0392..1d6aaff3 100755 --- a/package/nsis/check-running.nsh +++ b/package/nsis/check-running.nsh @@ -1,5 +1,4 @@ !macro EnsureAppIsNotRunning - Var /GLOBAL retryNumEnsureAppIsNotRunning ${For} $retryNumEnsureAppIsNotRunning 0 1000 DetailPrint "Checking if ${PRODUCT_EXE} is running..." nsExec::ExecToStack /OEM 'tasklist /NH /FI "IMAGENAME eq ${PRODUCT_EXE}"' diff --git a/package/nsis/main-un.nsi b/package/nsis/main-un.nsi index 41ddcf15..d95206c4 100755 --- a/package/nsis/main-un.nsi +++ b/package/nsis/main-un.nsi @@ -1,4 +1,5 @@ !include package\nsis\defines.nsh +!include package\nsis\variables.nsh !include package\nsis\includes.nsh !include package\nsis\check-running.nsh diff --git a/package/nsis/main.nsi b/package/nsis/main.nsi index c026efd6..30da6d87 100755 --- a/package/nsis/main.nsi +++ b/package/nsis/main.nsi @@ -1,4 +1,5 @@ !include package\nsis\defines.nsh +!include package\nsis\variables.nsh !include package\nsis\includes.nsh !include package\nsis\check-running.nsh @@ -22,8 +23,6 @@ !insertmacro MUI_LANGUAGE "English" -Var /GLOBAL isUpdaterMode - Function .onInit ${GetOptions} $CMDLINE "/U" $isUpdaterMode diff --git a/package/nsis/variables.nsh b/package/nsis/variables.nsh new file mode 100644 index 00000000..32411372 --- /dev/null +++ b/package/nsis/variables.nsh @@ -0,0 +1,2 @@ +Var /GLOBAL isUpdaterMode +Var /GLOBAL retryNumEnsureAppIsNotRunning