client: corrected the problematic situation where python was installed without easy_install

src/nsi/installer/install.cmd

@@ -27,6 +27,8 @@ IF NOT "%3"=="" (
     )
     )
 )
 )
 
 
+SET "32PythonOn64=False"
+
 :BatchCheckElevated
 :BatchCheckElevated
 :-------------------------------------
 :-------------------------------------
 REM  --> Check for permissions
 REM  --> Check for permissions
@@ -72,6 +74,7 @@ SET index=8
         if "!architecture!"=="64" (
         if "!architecture!"=="64" (
 			if "%python_registry%"=="" (
 			if "%python_registry%"=="" (
 				SET "python_registry=Wow6432Node\"
 				SET "python_registry=Wow6432Node\"
+                SET "32PythonOn64=True"
 				GOTO PYTHON_CHECK
 				GOTO PYTHON_CHECK
 			) else (
 			) else (
 				GOTO NOPYTHON
 				GOTO NOPYTHON
@@ -97,14 +100,14 @@ IF NOT "!output_on_screen!"=="False" (
     IF NOT "!output_on_screen!"=="False" (
     IF NOT "!output_on_screen!"=="False" (
         @echo 	64 bit system detected, commencing the install
         @echo 	64 bit system detected, commencing the install
     )
     )
-    start /WAIT ^"%running_directory%x64^\python-2.7.7.amd64.msi^"
+    start "Phyton Installer" /WAIT ^"%running_directory%x64^\python-2.7.7.amd64.msi^"
     GOTO NOWHASPYTHON
     GOTO NOWHASPYTHON
  )
  )
  if "!architecture!"=="32" (
  if "!architecture!"=="32" (
     IF NOT "!output_on_screen!"=="False" (
     IF NOT "!output_on_screen!"=="False" (
         @echo 	32 bit system detected, commencing the install
         @echo 	32 bit system detected, commencing the install
     )
     )
-    start /WAIT ^"%running_directory%x86^\python-2.7.7.msi^"
+    start "Phyton Installer" /WAIT ^"%running_directory%x86^\python-2.7.7.msi^"
     GOTO NOWHASPYTHON
     GOTO NOWHASPYTHON
  )
  )
  GOTO ERR
  GOTO ERR
@@ -162,22 +165,30 @@ IF NOT "!output_on_screen!"=="False" (
         goto loop
         goto loop
     ) else (
     ) else (
         set test=%install_path:~0,-1%
         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%" /m & IF NOT "!output_on_screen!"=="False" ( @echo 	%test% set to PATH))
+        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!" /m & IF NOT "!output_on_screen!"=="False" ( @echo 	!test! set to PATH))
         set test=%install_path%Scripts
         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%" /m & IF NOT "!output_on_screen!"=="False" ( @echo 	%test% set to PATH))
+        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!" /m & IF NOT "!output_on_screen!"=="False" ( @echo 	!test! set to PATH))
     )
     )
  GOTO PIP_INSTALL
  GOTO PIP_INSTALL
 
 
+ :INSTALL_EASY_INSTALL
+ IF NOT "!output_on_screen!"=="False" (
+    @echo   Failed. Commencing installation of easy_install
+    CALL python ^"%running_directory%ez_setup.py^" >nul 2>&1
+ ) else (
+    CALL python ^"%running_directory%ez_setup.py^" >nul 2>&1
+ )
+    @echo       Done.
+ GOTO PIP_INSTALL
  
  
  :PIP_INSTALL
  :PIP_INSTALL
  IF NOT "!output_on_screen!"=="False" (
  IF NOT "!output_on_screen!"=="False" (
     @echo Commencing PIP reinstall to solve compatibility issues
     @echo Commencing PIP reinstall to solve compatibility issues
- )
- IF NOT "!output_on_screen!"=="False" (
 	CALL easy_install pip
 	CALL easy_install pip
  ) else (
  ) else (
 	CALL easy_install pip >nul 2>&1
 	CALL easy_install pip >nul 2>&1
  )
  )
+ IF ERRORLEVEL 1 GOTO INSTALL_EASY_INSTALL
  SET "pip_program=requirements.txt"
  SET "pip_program=requirements.txt"
  IF NOT "!output_on_screen!"=="False" (
  IF NOT "!output_on_screen!"=="False" (
     @echo Installing python modules
     @echo Installing python modules
@@ -209,9 +220,9 @@ IF NOT "!output_on_screen!"=="False" (
     call python %running_directory%pywin_installer.py
     call python %running_directory%pywin_installer.py
  ) else (
  ) else (
     IF NOT "!output_on_screen!"=="False" (
     IF NOT "!output_on_screen!"=="False" (
-        call python -m pip install -r requirements.txt
+        call python -m pip install -r !pip_program!
     ) else (
     ) else (
-        call python -m pip install -r requirements.txt >nul 2>&1
+        call python -m pip install -r !pip_program! >nul 2>&1
     )
     )
  )
  )
  goto CHECK_PACKAGE_LIST
  goto CHECK_PACKAGE_LIST
@@ -428,7 +439,6 @@ IF NOT "!output_on_screen!"=="False" (
     xcopy>nul "%running_directory%windowsclasses.py" "%install_location%\" /y
     xcopy>nul "%running_directory%windowsclasses.py" "%install_location%\" /y
     xcopy>nul "%running_directory%nxkey.py" "%install_location%\" /y
     xcopy>nul "%running_directory%nxkey.py" "%install_location%\" /y
     xcopy>nul "%running_directory%OrderedDict.py" "%install_location%\" /y
     xcopy>nul "%running_directory%OrderedDict.py" "%install_location%\" /y
-    xcopy>nul "%running_directory%cloud.ico" "%install_location%\" /y
     xcopy>nul "%running_directory%putty.exe" "%install_location%\" /y
     xcopy>nul "%running_directory%putty.exe" "%install_location%\" /y
 IF NOT "!output_on_screen!"=="False" (
 IF NOT "!output_on_screen!"=="False" (
     @echo 	Done
     @echo 	Done
@@ -446,9 +456,9 @@ if NOT "!browserToUse!"=="" (
     SET "selenium_driver= -d !browserToUse!"
     SET "selenium_driver= -d !browserToUse!"
 )
 )
 IF NOT "!output_on_screen!"=="False" (
 IF NOT "!output_on_screen!"=="False" (
-    call python ^"%running_directory%win_install.py!selenium_driver!^" ^-l "%install_location%\\"!create_url_icon!!website!
+    call python ^"%running_directory%win_install.py^"!selenium_driver! ^-l "%install_location%\\"!create_url_icon!!website!
 ) else (
 ) else (
-    call python ^"%running_directory%win_install.py!selenium_driver!^" ^-l "%install_location%\\"!create_url_icon!!website! >nul 2>&1
+    call python ^"%running_directory%win_install.py^"!selenium_driver! ^-l "%install_location%\\"!create_url_icon!!website! >nul 2>&1
 )
 )
 IF NOT "!output_on_screen!"=="False" (
 IF NOT "!output_on_screen!"=="False" (
     @echo 	Done
     @echo 	Done