Added checking for registry trash

c6d07507 · Csók Tamás · e4e27bf2 · c6d07507 · c6d07507 · c6d07507
Commit c6d07507 authored Jul 16, 2014 by Csók Tamás
Hide whitespace changes
Inline Side-by-side

Showing with 32 additions and 14 deletions

dist/CIRCLE_Client_Setup.exe
+0 -0

src/batch/install.bat
+16 -7

src/iss/installer/install.bat
+16 -7

No files found.
--- a/dist/CIRCLE_Client_Setup.exe
+++ b/dist/CIRCLE_Client_Setup.exe
--- a/src/batch/install.bat
+++ b/src/batch/install.bat
@@ -22,8 +22,8 @@ SET "website="
 IF NOT "%3"=="" (
    IF "%install_selenium%"=="False" (
        SET site=%3
-        SET site=!site:"=!
+        SET my_site=!site:"=!
-        SET "website= -t ^"!site!^""
+        SET "website= -t ^"!my_site!^""
    )
 )
@@ -40,7 +40,8 @@ if '%errorlevel%' NEQ '0' (
 :UACPrompt
    echo Set UAC = CreateObject^("Shell.Application"^) > "%temp%\getadmin.vbs"
-    echo UAC.ShellExecute "cmd.exe", "/c %~s0 !output_on_screen! !install_selenium! ^"!site!^"", "", "runas", 1 >> "%temp%\getadmin.vbs"
+    set vbs_site=!site:"=""!
+    echo UAC.ShellExecute "cmd.exe", "/c %~s0 !output_on_screen! !install_selenium! !vbs_site!", "", "runas", 1 >> "%temp%\getadmin.vbs"
    "%temp%\getadmin.vbs"
    del "%temp%\getadmin.vbs"
@@ -153,10 +154,18 @@ IF NOT "!output_on_screen!"=="False" (
    for /f "tokens=2,*" %%a in ('reg query "hklm\SOFTWARE\%python_registry%Python\PythonCore\%version%\InstallPath"') do (
        set install_path=%%b
    )
-    set test=%install_path:~0,-1%
+    rem Check whether python.exe is in the install path (python uninstall doesn't delete registry entrys)
-    call %running_directory%inPath test && (IF NOT "!output_on_screen!"=="False" (@echo 	%test% is already in PATH)) || (call %running_directory%addPath test &  setx>nul PATH "%PATH%;%test%" & IF NOT "!output_on_screen!"=="False" ( @echo 	%test% set to local PATH))
+    if NOT EXIST "%install_path%python.exe" (
-    set test=%install_path%Scripts
+        IF NOT "!output_on_screen!"=="False" (
-    call %running_directory%inPath test && (IF NOT "!output_on_screen!"=="False" (@echo 	%test% is already in PATH)) || (call %running_directory%addPath test &  setx>nul PATH "%PATH%;%test%" & IF NOT "!output_on_screen!"=="False" ( @echo 	%test% set to local PATH))
+            @echo   %version% Python was installed but it is NOT now. Restarting the search for python^^!
+        )
+        goto loop
+    ) else (
+        set test=%install_path:~0,-1%
+        call %running_directory%inPath test && (IF NOT "!output_on_screen!"=="False" (@echo 	%test% is already in PATH)) || (call %running_directory%addPath test &  setx>nul PATH "%PATH%;%test%" & IF NOT "!output_on_screen!"=="False" ( @echo 	%test% set to local PATH))
+        set test=%install_path%Scripts
+        call %running_directory%inPath test && (IF NOT "!output_on_screen!"=="False" (@echo 	%test% is already in PATH)) || (call %running_directory%addPath test &  setx>nul PATH "%PATH%;%test%" & IF NOT "!output_on_screen!"=="False" ( @echo 	%test% set to local PATH))
+    )
 GOTO PIP_CHECK

--- a/src/iss/installer/install.bat
+++ b/src/iss/installer/install.bat
@@ -22,8 +22,8 @@ SET "website="
 IF NOT "%3"=="" (
    IF "%install_selenium%"=="False" (
        SET site=%3
-        SET site=!site:"=!
+        SET my_site=!site:"=!
-        SET "website= -t ^"!site!^""
+        SET "website= -t ^"!my_site!^""
    )
 )
@@ -40,7 +40,8 @@ if '%errorlevel%' NEQ '0' (
 :UACPrompt
    echo Set UAC = CreateObject^("Shell.Application"^) > "%temp%\getadmin.vbs"
-    echo UAC.ShellExecute "cmd.exe", "/c %~s0 !output_on_screen! !install_selenium! ^"!site!^"", "", "runas", 1 >> "%temp%\getadmin.vbs"
+    set vbs_site=!site:"=""!
+    echo UAC.ShellExecute "cmd.exe", "/c %~s0 !output_on_screen! !install_selenium! !vbs_site!", "", "runas", 1 >> "%temp%\getadmin.vbs"
    "%temp%\getadmin.vbs"
    del "%temp%\getadmin.vbs"
@@ -153,10 +154,18 @@ IF NOT "!output_on_screen!"=="False" (
    for /f "tokens=2,*" %%a in ('reg query "hklm\SOFTWARE\%python_registry%Python\PythonCore\%version%\InstallPath"') do (
        set install_path=%%b
    )
-    set test=%install_path:~0,-1%
+    rem Check whether python.exe is in the install path (python uninstall doesn't delete registry entrys)
-    call %running_directory%inPath test && (IF NOT "!output_on_screen!"=="False" (@echo 	%test% is already in PATH)) || (call %running_directory%addPath test &  setx>nul PATH "%PATH%;%test%" & IF NOT "!output_on_screen!"=="False" ( @echo 	%test% set to local PATH))
+    if NOT EXIST "%install_path%python.exe" (
-    set test=%install_path%Scripts
+        IF NOT "!output_on_screen!"=="False" (
-    call %running_directory%inPath test && (IF NOT "!output_on_screen!"=="False" (@echo 	%test% is already in PATH)) || (call %running_directory%addPath test &  setx>nul PATH "%PATH%;%test%" & IF NOT "!output_on_screen!"=="False" ( @echo 	%test% set to local PATH))
+            @echo   %version% Python was installed but it is NOT now. Restarting the search for python^^!
+        )
+        goto loop
+    ) else (
+        set test=%install_path:~0,-1%
+        call %running_directory%inPath test && (IF NOT "!output_on_screen!"=="False" (@echo 	%test% is already in PATH)) || (call %running_directory%addPath test &  setx>nul PATH "%PATH%;%test%" & IF NOT "!output_on_screen!"=="False" ( @echo 	%test% set to local PATH))
+        set test=%install_path%Scripts
+        call %running_directory%inPath test && (IF NOT "!output_on_screen!"=="False" (@echo 	%test% is already in PATH)) || (call %running_directory%addPath test &  setx>nul PATH "%PATH%;%test%" & IF NOT "!output_on_screen!"=="False" ( @echo 	%test% set to local PATH))
+    )
 GOTO PIP_CHECK