-- install-env script added to set up environment

-- make script uses install-env to update environment before build
-- curl used for downloading
-- Expand-Archive cmdlet used for .zip extraction
-- virtualenv replaced with pip offline packages
-- output folder compressed to .zip on complete
-- install script added for client side environment set up

Author: pashagolub

install-env.bat

@@ -3,6 +3,4 @@ SET PYTHON_REF=https://www.python.org/ftp/python/3.7.3/python-3.7.3-amd64.exe
 @ECHO --- Download PYTHON ---
 curl %PYTHON_REF% --output python-install.exe
 python-install.exe /quiet InstallAllUsers=0 PrependPath=1 Include_test=0
-python -m pip install --upgrade pip
-pip install virtualenv
-DEL python-install.exe
+python -m pip install --upgrade pip

make.bat

@@ -6,29 +6,38 @@ SET PATRONI_REF=https://github.com/zalando/patroni/archive/v1.5.6.zip
 
 ECHO --- Start bootstrapping ---
 
-RMDIR /Q /S %MD% patroni > nul
+RMDIR /Q /S %MD% patroni > nul 2>&1
 MKDIR %MD%
 COPY src\*.* %MD%\
 
-@ECHO on
+@ECHO --- Update Python and PIP installation ---
+@CALL install-env.bat
+MOVE python-install.exe %MD%\
+@ECHO --- Python and PIP installation updated ---
 
 @ECHO --- Download ETCD ---
-powershell -Command "[Net.ServicePointManager]::SecurityProtocol = 'tls12, tls11, tls'; ((new-object net.webclient).DownloadFile('%ETCD_REF%', '%TEMP%\etcd.zip'))"
-powershell -Command "$shell = New-Object -ComObject Shell.Application; 	$zip_src = $shell.NameSpace('%TEMP%\etcd.zip'); $zip_dest = $shell.NameSpace((Resolve-Path '%CD%').Path); $zip_dest.CopyHere($zip_src.Items(), 1044)"
+curl %ETCD_REF% --location --output %TEMP%\etcd.zip
+powershell -Command "Expand-Archive '%TEMP%\etcd.zip' '%CD%'"
 MOVE etcd-* %MD%\etcd
+@ECHO --- ETCD downloaded ---
 
 @ECHO --- Download PATRONI ---
-powershell -Command "[Net.ServicePointManager]::SecurityProtocol = 'tls12, tls11, tls'; ((new-object net.webclient).DownloadFile('%PATRONI_REF%', '%TEMP%\patroni.zip'))"
-powershell -Command "$shell = New-Object -ComObject Shell.Application; 	$zip_src = $shell.NameSpace('%TEMP%\patroni.zip'); $zip_dest = $shell.NameSpace((Resolve-Path '%CD%').Path); $zip_dest.CopyHere($zip_src.Items(), 1044)"
+curl %PATRONI_REF% --location --output %TEMP%\patroni.zip
+powershell -Command "Expand-Archive '%TEMP%\patroni.zip' '%CD%'"
 MOVE patroni-* patroni
+@ECHO --- PATRONI downloaded ---
 
+@ECHO --- Download PATRONI packages ---
 CD patroni
-virtualenv.exe venv
-CALL venv\Scripts\activate || EXIT /B 1
-pip install -r requirements.txt || EXIT /B 1
-pip install psycopg2-binary || EXIT /B 1
-CALL venv\Scripts\deactivate || EXIT /B 1
+pip download -r requirements.txt -d .patroni-packages
+pip download psycopg2-binary -d .patroni-packages
+@ECHO --- PATRONI packages downloaded ---
 
-MOVE venv ..\%MD%\venv
 CD ..
-MOVE patroni %MD%\patroni
+MOVE patroni %MD%\patroni
+
+@ECHO --- Prepare archive ---
+powershell -Command "Compress-Archive '%MD%' '%MD%.zip'"
+@ECHO --- Archive compressed ---
+
+@ECHO --- PACKAGING FINISHED ---

src/install.bat

@@ -0,0 +1,12 @@
+@ECHO on
+
+@ECHO --- Installing Python runtime ---
+python-install.exe /quiet InstallAllUsers=0 PrependPath=1 Include_test=0
+@ECHO --- Python runtime installed ---
+
+@ECHO --- Installing Patroni packages ---
+python -m pip install --upgrade pip
+CD patroni
+pip install --no-index --find-links .patroni-packages -r requirements.txt
+pip install --no-index --find-links .patroni-packages psycopg2-binary
+@ECHO --- Patroni packages installed ---