mirrors/deluge
0
0
Fork 0
mirror of https://git.deluge-torrent.org/deluge synced 2025-08-02 22:48:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Auto-detect if python is installed on startup

Browse source
This commit is contained in:
John Garland 2009-02-25 07:58:50 +00:00
commit c7a67f5c53
1 changed files with 16 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

19
win32/deluge.nsi
View file

@ -28,7 +28,7 @@
!macro install_MSI installer_name install_dir !macro install_MSI installer_name install_dir
${download} "${${installer_name}_URL}" "$TEMP\${${installer_name}}" ${download} "${${installer_name}_URL}" "$TEMP\${${installer_name}}"
ExecWait 'msiexec /qn /i "$TEMP\${${installer_name}}" TARGETDIR="${install_dir}' ExecWait 'msiexec /qn /i "$TEMP\${${installer_name}}"'
delete "$TEMP\${${installer_name}}" delete "$TEMP\${${installer_name}}"
!macroend !macroend
@ -96,6 +96,19 @@
${create_url} LIBTORRENT_INSTALLER ${create_url} LIBTORRENT_INSTALLER
${create_url} LIBTORRENT_DLL_ZIP ${create_url} LIBTORRENT_DLL_ZIP
; Variables
var PYTHONDIR
; Functions
Function .onInit
ReadRegStr $PYTHONDIR HKLM "SOFTWARE\Python\PythonCore\${PYTHON_VERSION}\InstallPath" ""
IfErrors 0 +2
StrCpy $PYTHONDIR "$INSTDIR\Python"
FunctionEnd
; General Settings ; General Settings
; Version ; Version
@ -337,8 +350,8 @@ SectionGroupEnd
; Descriptions ; Descriptions
; Language strings ; Language strings
LangString DESC_deluge ${LANG_ENGLISH} "Deluge 1.1.3" LangString DESC_deluge ${LANG_ENGLISH} "Deluge ${DELUGE_VERSION}"
LangString DESC_python ${LANG_ENGLISH} "Python 2.5.4" LangString DESC_python ${LANG_ENGLISH} "Python ${PYTHON_VERSION}"
; Assign language strings to sections ; Assign language strings to sections
!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN