Changeset c7a67f

Timestamp:

02/25/2009 07:58:50 AM (16 years ago)

Author:

John Garland <johnnyg@gmail.com>

Children:

538643

Parents:

29c98e

Message:

Auto-detect if python is installed on startup

File:

• win32/deluge.nsi (modified) (3 diffs)

win32/deluge.nsi

@@ -29 +29 @@
     !macro install_MSI installer_name install_dir
         ${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}}"
     !macroend
@@ -97 +97 @@
     ${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
 
@@ -338 +351 @@
 
     ; Language strings
-    LangString DESC_deluge ${LANG_ENGLISH} "Deluge 1.1.3"
-    LangString DESC_python ${LANG_ENGLISH} "Python 2.5.4"
+    LangString DESC_deluge ${LANG_ENGLISH} "Deluge ${DELUGE_VERSION}"
+    LangString DESC_python ${LANG_ENGLISH} "Python ${PYTHON_VERSION}"
 
     ; Assign language strings to sections