feat(nsis): Show welcome and finish page duing uninstall (electron-us…

…erland#1173)
develar · Jan 26, 2017 · aa43344 · aa43344
1 parent 688111e
commit aa43344
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/packages/electron-builder/templates/nsis/boringInstaller.nsh b/packages/electron-builder/templates/nsis/boringInstaller.nsh
@@ -47,10 +47,12 @@
   !insertmacro MUI_PAGE_INSTFILES
   !insertmacro MUI_PAGE_FINISH
 !else
+  !insertmacro MUI_UNPAGE_WELCOME
   !ifndef INSTALL_MODE_PER_ALL_USERS
     !insertmacro PAGE_INSTALL_MODE
   !endif
   !insertmacro MUI_UNPAGE_INSTFILES
+  !insertmacro MUI_UNPAGE_FINISH
 !endif
 
 !macro initMultiUser
@@ -129,4 +131,4 @@
   !endif
 !macroend
 
-!include "langs.nsh"
+!include "langs.nsh"
diff --git a/packages/electron-builder/templates/nsis/uninstaller.nsh b/packages/electron-builder/templates/nsis/uninstaller.nsh
@@ -2,10 +2,10 @@ Function un.onInit
   !insertmacro check64BitAndSetRegView
 
   ${IfNot} ${Silent}
-    MessageBox MB_OKCANCEL "Are you sure you want to uninstall ${PRODUCT_NAME}?" IDOK +2
-    Quit
-
     !ifdef ONE_CLICK
+      MessageBox MB_OKCANCEL "Are you sure you want to uninstall ${PRODUCT_NAME}?" IDOK +2
+      Quit
+
       # one-click installer executes uninstall section in the silent mode, but we must show message dialog if silent mode was not explicitly set by user (using /S flag)
       !insertmacro CHECK_APP_RUNNING "uninstall"
       SetSilent silent
@@ -62,5 +62,7 @@ Section "un.install"
     !insertmacro customUnInstall
   !endif
 
-  !insertmacro quitSuccess
-SectionEnd
+  !ifdef ONE_CLICK
+    !insertmacro quitSuccess
+  !endif
+SectionEnd