Push to 38 characters. Fix check length path.

hyperspy · Oct 25, 2018 · 89b4dc8 · 89b4dc8
1 parent 3f9d55b
commit 89b4dc8
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 8 deletions.
diff --git a/hspy_bundle/NSIS_installer_script.nsi b/hspy_bundle/NSIS_installer_script.nsi
@@ -12,6 +12,7 @@
 !include "nsDialogs.nsh"
 !include "StrFunc.nsh"
 !include "LogicLib.nsh"
+!include "WinVer.nsh"
 !include "FileFunc.nsh"
 !include "X64.nsh"
 !include "__DELETE_MACRO_NAME__.nsh"
@@ -97,12 +98,14 @@ RequestExecutionLevel user
 Page custom InstModeSelectionPage_Create InstModeSelectionPage_Leave
 !define MUI_PAGE_CUSTOMFUNCTION_PRE disableBack
 !define MUI_DIRECTORYPAGE_TEXT_TOP "${APPNAME} ${APPVERSION} will be installed in the following folder. To install to a different folder, click Browse and select another folder."
+!define MUI_PAGE_CUSTOMFUNCTION_LEAVE checkLengthPath
 !insertmacro MUI_PAGE_DIRECTORY
 !insertmacro MUI_PAGE_INSTFILES
 !insertmacro MUI_PAGE_FINISH
 
 ; ------- UAC functions -------------------------------------------------------
 Var InstMode ;0=current, 1=portable, 2=all users,
+Var InstDirLen
 
 Function InstModeChanged
 	${If} $InstMode = 0 ; Current user
@@ -152,6 +155,15 @@ Function disableBack
 	${EndIf}
 FunctionEnd
 
+Function checkLengthPath
+	StrLen $InstDirLen "${APP_INSTDIR}"
+	${IfNot} ${AtLeastWin8}
+	${AndIf} $InstDirLen > 38
+		MessageBox MB_OK|MB_ICONSTOP "On Windows 7 and older, the installation path should be shorter than 38 characters."
+		Abort
+	${EndIf}
+FunctionEnd
+
 Function RemoveNextBtnShield
 	GetDlgItem $0 $hwndParent 1
 	SendMessage $0 ${BCM_SETSHIELD} 0 0
@@ -210,11 +222,6 @@ Function InstModeSelectionPage_Leave
 	${NSD_GetState} $0 $9
 	${NSD_GetState} $1 $8
 
-	StrLen $INSTDIRLEN $INSTDIR
-	${If} $INSTDIRLEN > 35 ${AndIfNot} ${AtLeastWin8}
-		MessageBox MB_OK "Installation path should be shorter than 35 characters."
-	${EndIf}
-
 	${If} $8 = 1
 		!insertmacro SetInstMode 1
 	${ElseIf} $9 = 1

diff --git a/hspy_bundle/configure_installer.py b/hspy_bundle/configure_installer.py
@@ -172,9 +172,12 @@ def __init__(self, dist_path, version, arch=("32", "64")):
         if not isinstance(arch, (list, tuple)):
             arch = (arch,)
         self.arch = arch
-        self.wppath = dict((
-            (a, glob(os.path.join(dist_path, "WinPython-%s*" % a))[0])
-            for a in arch))
+        try:
+            self.wppath = dict((
+                (a, glob(os.path.join(dist_path, "WinPython-%s*" % a))[0])
+                for a in arch))
+        except IndexError:
+            raise RuntimeError("No Winpython distribution can be found.")
         self.distributions = dict((
             (a, winpython.wppm.Distribution(
                 self.get_full_paths("python-*", a)))