Skip to content

Commit 311694c

Browse files
committed
Simplified start menu shortcuts
(NSIS Locate plugin is no longer required)
1 parent d92b061 commit 311694c

File tree

3 files changed

+4
-23
lines changed

3 files changed

+4
-23
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Technologies
3030
DataLab-WinPython is based on the following technologies:
3131

3232
* Windows batch scripts (to minimize prerequisites)
33-
* NSIS installer creation software, with the "Locate" plugin
33+
* NSIS installer creation software
3434
* WinPython Python distribution
3535
* Python package manager "pip"
3636
* 7-zip compression software

nsis/installer.nsi

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ RequestExecutionLevel user
7070
!insertmacro MUI_LANGUAGE "French"
7171
LangString welcome_str ${LANG_ENGLISH} "This will install ${PRODNAME} on your computer.$\r$\n${PRODNAME} deploys itself as a simple folder unzipping to a custom target directory. Installing this software has thus limited effect on the operating system and will not compromise any existing Python installation.$\r$\n$\r$\nPlease click on Next to continue."
7272
LangString welcome_str ${LANG_FRENCH} "Vous êtes sur le point d'installer ${PRODNAME} sur votre ordinateur.$\r$\n${PRODNAME} s'installe par une simple copie de fichiers dans un répertoire de destination paramétrable. L'installation n'est pas invasive et peut cohabiter (sans effet de bord) avec n'importe quelle autre distribution Python déjà installée sur cet ordinateur.$\r$\n$\r$\nCliquez sur Suivant pour continuer."
73-
LangString explore_str ${LANG_ENGLISH} "Browse installation directory"
74-
LangString explore_str ${LANG_FRENCH} "Explorer le dossier d'installation"
73+
LangString explore_str ${LANG_ENGLISH} "Browse ${PRODNAME} installation directory"
74+
LangString explore_str ${LANG_FRENCH} "Explorer le dossier d'installation de ${PRODNAME}"
7575
LangString uninstall_str ${LANG_ENGLISH} "Uninstall ${PRODNAME}"
7676
LangString uninstall_str ${LANG_FRENCH} "Désinstaller ${PRODNAME}"
7777
LangString datalab_str ${LANG_ENGLISH} "Run DataLab"
@@ -95,26 +95,7 @@ Section "" SecWinPython
9595
File /r "${DISTDIR}\*.*"
9696
WriteUninstaller $INSTDIR\uninstaller.exe
9797
createDirectory "$SMPROGRAMS\${PRODNAME}"
98-
99-
${locate::Open} "$INSTDIR" `/F=1 /D=0 /M=*.* /B=1 /X=exe|bat /G=0` $0
100-
StrCmp $0 0 0 loop
101-
MessageBox MB_OK "Error" IDOK close
102-
loop:
103-
${locate::Find} $0 $1 $2 $3 $4 $5 $6
104-
StrCmp $3 '' close
105-
${GetBaseName} $3 $R0
106-
StrCpy $R1 "$INSTDIR\scripts\$R0.ico"
107-
IfFileExists $R1 has_icon no_icon
108-
has_icon:
109-
createShortCut "$SMPROGRAMS\${PRODNAME}\$R0.lnk" "$INSTDIR\$3" "" "$R1"
110-
goto loop
111-
no_icon:
112-
createShortCut "$SMPROGRAMS\${PRODNAME}\$R0.lnk" "$INSTDIR\$3"
113-
goto loop
114-
close:
115-
${locate::Close} $0
116-
${locate::Unload}
117-
98+
createShortCut "$SMPROGRAMS\${PRODNAME}\DataLab (WinPython).lnk" "$INSTDIR\DataLab.exe"
11899
createShortCut "$SMPROGRAMS\${PRODNAME}\$(explore_str).lnk" "$INSTDIR\"
119100
createShortCut "$SMPROGRAMS\${PRODNAME}\$(uninstall_str).lnk" "$INSTDIR\uninstaller.exe"
120101
WriteRegStr HKCU "${UINSTREG}" "DisplayName" "${PRODNAME}"

prerequisites/Locate.zip

-74 KB
Binary file not shown.

0 commit comments

Comments
 (0)