Windows silent uninstall fixes (qzind#714)

Fix environmental variable detection for silent install/uninstall Closes qzind#713
pavlovaleksei · Sep 24, 2020 · b5fb830 · b5fb830
1 parent 52ecaba
commit b5fb830
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/ant/windows/windows-uninstaller.nsi.in b/ant/windows/windows-uninstaller.nsi.in
@@ -97,7 +97,11 @@ Section
     ; We're NOT running from $TEMP, copy to temp and respawn ourself
     GetTempFileName $0
     CopyFiles "$EXEPATH" "$0"
-    Exec '"$0" /RESPAWN=1 /DELETE_DIR="$EXEDIR" /DELETE_EXE="$EXEPATH"'
+    ${If} ${Silent}
+      Exec '"$0" /S /RESPAWN=1 /DELETE_DIR="$EXEDIR" /DELETE_EXE="$EXEPATH"'
+    ${Else}
+      Exec '"$0" /RESPAWN=1 /DELETE_DIR="$EXEDIR" /DELETE_EXE="$EXEPATH"'
+    ${EndIf}
     Quit
   ${EndIf}
 SectionEnd

diff --git a/src/qz/installer/Installer.java b/src/qz/installer/Installer.java
@@ -42,7 +42,7 @@ public abstract class Installer {
     protected static final Logger log = LoggerFactory.getLogger(Installer.class);
 
     // Silence prompts within our control
-    public static boolean IS_SILENT =  "1".equals(System.getenv(PROPS_FILE + "_silent"));
+    public static boolean IS_SILENT =  "1".equals(System.getenv(DATA_DIR + "_silent"));
 
     public enum PrivilegeLevel {
         USER,
@@ -75,7 +75,7 @@ public static Installer getInstance() {
     }
 
     public static void install(String destination, boolean silent) throws Exception {
-        IS_SILENT = silent;
+        IS_SILENT |= silent; // preserve environmental variable if possible
         getInstance();
         if (destination != null) {
             instance.setDestination(destination);