Second attempt at autodetect install

2009-02-25 11:27:09 +00:00 · 2009-02-25 11:27:09 +00:00 · 16c8769ab9
commit 16c8769ab9
parent 2efc6161f2
1 changed files with 4 additions and 6 deletions
--- a/win32/deluge.nsi
+++ b/win32/deluge.nsi
@ -13,9 +13,8 @@
    !macroend

    !macro autodetect component
+        Push ${${component}}
        Call autodetect_${component}
-        Pop $0
-        SectionIn $0
    !macroend

    !macro download url filename
@ -111,11 +110,10 @@
 ; Functions

 Function autodetect_python
-    StrCpy $0 "1 2"
-    ReadRegStr $1 HKLM "SOFTWARE\Python\PythonCore\${PYTHON_VERSION}\InstallPath" ""
+    Pop $0
+    ReadRegStr "" HKLM "SOFTWARE\Python\PythonCore\${PYTHON_VERSION}\InstallPath" ""
    IfErrors 0 +2
-        StrCpy $0 "2"
-    Push $0
+        SectionSetInstTypes $0 3
 FunctionEnd

 Function set_python_dir