From 0b41ef035b6b595380a2fa7591b27511bbe8dd2c Mon Sep 17 00:00:00 2001
From: rlbr <raphael.roberts48@gmail.com>
Date: Fri, 30 Nov 2018 12:19:13 -0600
Subject: [PATCH] install.bat is done

---
 install.bat      | 51 +++++++++++++++++++++++++++++++++++-------------
 restore_path.bat |  3 +++
 2 files changed, 40 insertions(+), 14 deletions(-)
 create mode 100644 restore_path.bat

diff --git a/install.bat b/install.bat
index de6065a..a9f374c 100644
--- a/install.bat
+++ b/install.bat
@@ -1,33 +1,56 @@
 @echo off
+REM set up parent and current directory constants
+for %%d in (%~dp0.) do set Directory=%%~fd
+for %%d in (%~dp0..) do set ParentDirectory=%%~fd
 
-  for %%d in (%~dp0.) do set Directory=%%~fd
-
-  for %%d in (%~dp0..) do set ParentDirectory=%%~fd
-  
-for /f "usebackq tokens=*" %%a in (`dir /B installer`) do (
-    set setup=installer\%%a
+REM find installer
+for /f "usebackq tokens=*" %%a in (`dir /B "%Directory%\install" ^| findstr /r /i "\.exe$"`) do (
+    set setup="%%a"
 	goto skipA
 )
 :skipA
-REM set Directory=%~dp0
+
+REM run installer
+move "%Directory%\install\%setup%" "%Directory%\%setup%"
 "%Directory%\%setup%"
-    REM set winpython=%%a
+move "%Directory%\%setup%" "%Directory%\install\%setup%"
+
+REM find winpython dir
 for /f "usebackq tokens=*" %%a in (`dir /A:D /B ^| findstr /r /i w.*py.*`) do (
     set winpython=%%a
 	goto skipB
 )
 :skipB
-set winpython="%Directory%\%winpython%"
-for /f "usebackq tokens=*" %%a in (`dir /A:D /B %winpython% ^| findstr /r /i python.*`) do (
+set winpython=%Directory%\%winpython%
+
+REM find python binary dir
+for /f "usebackq tokens=*" %%a in (`dir /b "%winpython%" ^| findstr /r /i "python-[0-9]\.[0-9]\.[0-9]"`) do (
 	set exe=%%a
 	goto skipC
 )
 :skipC
-workers\path_append "%winpython%\%exe%"
-set exe="%winpython%\%exe%\python.exe"
+set pa="%Directory%\workers\path_append.bat"
+REM python setup
+set PATH="%winpython%\%exe%";%PATH%
 setx winpython %winpython%
+python -m pip install -r "%Directory%\google_api_wrapper\requirements.txt"
+
+REM adding path_append.bat to user script dir
+echo:@echo off > "%Directory%\ua-path\path_append.bat"
+echo:"%Directory%\workers\path_append.bat" %%1 >> "%Directory%\ua-path\path_append.bat"
+
+REM adding user script dir to path
+
+REM idle settings
 md "%winpython%\settings\.idlerc"
-copy config-highlight.cfg %winpython%\settings\.idlerc
+copy config-highlight.cfg "%winpython%\settings\.idlerc"
+
+REM notepad++ settings
 md "%appdata%\Notepad++\themes"
 copy themes "%appdata%\Notepad++\themes"
-"%exe%" -m pip install -r %Directory%\google_api_wrapper\requirements.txt
\ No newline at end of file
+
+REM append to PATH
+call %pa% "%winpython%\%exe%"
+call %pa% "%winpython%\%exe%\Scripts"
+call %pa% "%Directory%\ua-path"
+:end
\ No newline at end of file
diff --git a/restore_path.bat b/restore_path.bat
new file mode 100644
index 0000000..01c5ada
--- /dev/null
+++ b/restore_path.bat
@@ -0,0 +1,3 @@
+@echo off
+set op=C:\Program Files (x86)\Common Files\Oracle\Java\javapath;C:\Program Files (x86)\Common Files\Intel\Shared Libraries\redist\ia32\mpirt;C:\Program Files (x86)\Common Files\Intel\Shared Libraries\redist\ia32\compiler;C:\Program Files (x86)\Intel\iCLS Client\;C:\Program Files\Intel\iCLS Client\;C:\Program Files\Common Files\Microsoft Shared\Windows Live;C:\Program Files (x86)\Common Files\Microsoft Shared\Windows Live;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Program Files (x86)\Windows Live\Shared;C:\Program Files (x86)\Intel\Intel(R) Management Engine Components\DAL;C:\Program Files\Intel\Intel(R) Management Engine Components\DAL;C:\Program Files (x86)\Intel\Intel(R) Management Engine Components\IPT;C:\Program Files\Intel\Intel(R) Management Engine Components\IPT;C:\Program Files\Microsoft DNX\Dnvm\;C:\Program Files\Microsoft SQL Server\120\Tools\Binn\;C:\Program Files\Microsoft SQL Server\130\Tools\Binn\;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Program Files\IBM\SPSS\Statistics\24\JRE\bin;
+powershell -Command "[Environment]::SetEnvironmentVariable('path','%op%','user')"
\ No newline at end of file