Further changes to dialog text and skip pages validation

spyder-ide · Jul 11, 2022 · 0e00c23 · 0e00c23
1 parent 0593a90
commit 0e00c23
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/nsist/spyder.nsi b/nsist/spyder.nsi
@@ -42,6 +42,7 @@ SetCompressor lzma
 !define MUI_PAGE_CUSTOMFUNCTION_PRE validate_pre_install
 !insertmacro MUI_PAGE_WELCOME
 [% if license_file %]
+!define MUI_PAGE_CUSTOMFUNCTION_PRE validate_updating_and_skip
 !insertmacro MUI_PAGE_LICENSE [[license_file]]
 [% endif %]
 !insertmacro MULTIUSER_PAGE_INSTALLMODE
@@ -59,8 +60,10 @@ Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
 OutFile "${INSTALLER_NAME}"
 ShowInstDetails show
 
+; Variables used globally
 Var cmdLineInstallDir
 Var uninstallPreviousInstallation
+Var updatingInstallation
 
 Section -SETTINGS
   SetOutPath "$INSTDIR"
@@ -271,7 +274,8 @@ Function validate_pre_install
     MessageBox MB_YESNO|MB_ICONINFORMATION "${PRODUCT_NAME} is running. It is necessary to close it before installing a new version. Do you want to close ${PRODUCT_NAME} now?" \
                                             /SD IDYES IDYES Confirm IDNO NoClose
                                             Confirm:
-                                              MessageBox MB_YESNO|MB_ICONINFORMATION "All unsaved files and changes will be lost. In addition, any program that you are running in ${PRODUCT_NAME}'s IPython console will be stopped. Are you sure you want to close ${PRODUCT_NAME}?" \
+                                              MessageBox MB_YESNO|MB_ICONINFORMATION "All unsaved files and changes will be lost. In addition, any program that you are running in ${PRODUCT_NAME}'s IPython console will be stopped. \
+                                                                                      $\r$\n$\r$\nAre you sure you want to close ${PRODUCT_NAME}?" \
                                                                                       /SD IDYES IDYES CloseSpyder IDNO NoClose
                                               CloseSpyder:
                                                 Banner::show /set 76 "Please wait while closing ${PRODUCT_NAME}..." " "
@@ -305,12 +309,20 @@ Function validate_pre_install
     ExecWait '"$TEMP\spyder-uninstaller\uninstall.exe" /S _?=$INSTDIR'
     RMDir /r $TEMP\spyder-uninstaller
     Banner::destroy
+    StrCpy $updatingInstallation 1
+    Abort
     GoTo NotInstalled
   NoUninstall:
     Quit
   NotInstalled:
 FunctionEnd
 
+Function validate_updating_and_skip
+  ${If} $updatingInstallation == 1
+    Abort
+  ${EndIf}
+FunctionEnd
+
 Function .onMouseOverSection
     ; Find which section the mouse is over, and set the corresponding description.
     FindWindow $R0 "#32770" "" $HWNDPARENT