fix(nsis): do not delete app data by default

Closes #769
electron-userland · Oct 2, 2016 · 64937b2 · 64937b2
1 parent c45adca
commit 64937b2
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/templates/nsis/installSection.nsh b/templates/nsis/installSection.nsh
@@ -28,7 +28,17 @@
       ${else}
         StrCpy $0 "/allusers"
       ${endif}
-      ExecWait '"$PLUGINSDIR\old-uninstaller.exe" /S /KEEP_APP_DATA $0 _?=$R1'
+
+      ClearErrors
+      ${GetParameters} $R4
+      ${GetOptions} $R4 "--delete-app-data" $R5
+      ${ifNot} ${Errors}
+        StrCpy $1 "--delete-app-data"
+      ${else}
+        StrCpy $1 ""
+      ${endif}
+
+      ExecWait '"$PLUGINSDIR\old-uninstaller.exe" /S /KEEP_APP_DATA $0 $1 _?=$R1'
     ${endif}
   ${endif}
 !macroend

diff --git a/templates/nsis/uninstaller.nsh b/templates/nsis/uninstaller.nsh
@@ -44,8 +44,8 @@ Section "un.install"
 
   ClearErrors
   ${GetParameters} $R0
-  ${GetOptions} $R0 "/KEEP_APP_DATA" $R1
-  ${If} ${Errors}
+  ${GetOptions} $R0 "--delete-app-data" $R1
+  ${IfNot} ${Errors}
     # electron always uses per user app data
     ${if} $installMode == "all"
       SetShellVarContext current

diff --git a/test/src/nsisTest.ts b/test/src/nsisTest.ts
@@ -103,6 +103,11 @@ async function doTest(outDir: string, perUser: boolean) {
   fsChanges = diff(fsBefore, fsAfter, driveC)
   assertThat(fsChanges.added).isEqualTo([])
   assertThat(fsChanges.deleted).isEqualTo([])
+
+  await assertThat(appDataFile).isFile()
+
+  await wine.exec(path.join(outDir, "TestApp Setup 1.1.0.exe"), "/S", "--delete-app-data")
+  await assertThat(appDataFile).doesNotExist()
 }
 
 test.ifNotCiOsx("boring", app({