refactor prj (pip scripts)

prj/script/pip_reqs_export.cmd

@@ -1,4 +1,4 @@
-SET "script_dir=%~dp0"
-SET "script_dir=%script_dir:~0,-1%"   
+@echo off
+call common.cmd
 
-CALL %script_dir%\venv\Scripts\pip freeze > ..\pip_reqs.txt
+CALL %venv_dir%\Scripts\pip freeze > %pip_reqs_dir%\pip_reqs.txt

prj/script/pip_reqs_export.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-script_dir=$(dirname "$0")
+source common.sh
 
 # persist the exact dependencies (recursively)
-$script_dir/venv/bin/pip freeze > $script_dir/../pip_reqs.txt
+${venv_dir}/bin/pip freeze > ${pip_reqs_dir}/pip_reqs.txt

prj/script/pip_reqs_install.cmd

@@ -1,21 +1,12 @@
-SET "script_dir=%~dp0"
-SET "script_dir=%script_dir:~0,-1%"   
+@echo off
+call common.cmd
 
-CALL %script_dir%\venv\Scripts\python -m pip install --upgrade pip
-CALl %script_dir%\venv\Scripts\pip install --upgrade setuptools
+CALL %venv_dir%\Scripts\python -m pip install --upgrade pip
+CALl %venv_dir%\Scripts\pip install --upgrade setuptools
 
 
-REM Latest
-REM ------
-REM install (latest versions of) dependencies
-REM ------
-CAll %script_dir%\venv\Scripts\pip install -r ..\pip_reqs_base.txt
+REM 1) install latest (versions of) dependencies
+CALL ${venv_dir}/bin/pip install -r ${pip_reqs_dir}/pip_reqs_base.txt
 
-REM Exact
-REM ------
-REM alternatively, use this instead to install exact (recursive) dependencies previously 'frozen' by
-REM previous call to 'pip_reqs_export.sh'
-REM
-REM recommended for production
-REM ------
-REM CAll .\venv\Scripts\pip install -r ..\pip_reqs.txt
+REM 2) install exact (versions of) dependencies
+REM CALL ${venv_dir}/bin/pip install  -r ../pip_reqs.txt

prj/script/pip_reqs_install.sh

@@ -1,20 +1,17 @@
 #!/bin/bash
 
-script_dir=$(dirname "$0")
+source common.sh
 
-$script_dir/venv/bin/python -m pip install --upgrade pip
-$script_dir/venv/bin/pip install --upgrade setuptools
+${venv_dir}/bin/python -m pip install --upgrade pip
+${venv_dir}/bin/pip install --upgrade setuptools
 
 
-# Latest
-# ------
-# install (latest versions of) dependencies
-$script_dir/venv/bin/pip install -r $script_dir/../pip_reqs_base.txt
 
-# Exact
-# ------
-# alternatively, use this instead to install exact (recursive) dependencies previously 'frozen' by
-# previous call to 'pip_reqs_export.sh'
-#
+# 1) install latest (versions of) dependencies
+${venv_dir}/bin/pip install -r ${pip_reqs_dir}/pip_reqs_base.txt
+
+# 2) install exact (versions of) dependencies
+#./venv/bin/pip install -r ../pip_reqs.txt
+
+# eg from previous call to 'pip_reqs_export.sh'
 # recommended for production
-#./venv/bin/pip install -r ../pip_reqs_base.txt

prj/script/venv_create.cmd

@@ -1,23 +1,24 @@
 REM set HTTPS_PROXY= http://10.110.15.6:8080
 
-SET "script_dir=%~dp0"
-SET "script_dir=%script_dir:~0,-1%"   
+@echo off
+call common.cmd
+
 
 CALL python -m venv %script_dir%\venv
 
 echo ".....virtual environment created"
 
-CALL %script_dir%\venv\Scripts\activate
+CALL %venv_dir%\Scripts\activate
 
 echo ".....pip reqs installing...."
 
 CALL  %script_dir%\pip_reqs_install.cmd
 
 echo ".....pip reqs installed"
 
-CALL %script_dir%\\venv\Scripts\deactivate
+CALL %venv_dir%\Scripts\deactivate
 
 echo ".....venv ready"
 
 
-pause
+pause

prj/script/venv_create.sh

@@ -1,16 +1,18 @@
 #!/bin/bash
 
-script_dir=$(dirname "$0")
+source ./common.sh
 
-python3 -m venv $script_dir/venv
+
+python3 -m venv ${venv_dir}
 
 echo ".....virtual environment created"
 
-source $script_dir/venv/bin/activate
+source ${venv_dir}/bin/activate
 
 echo ".....pip reqs installing...."
 
-source  $script_dir/pip_reqs_install.sh
+
+source  ${script_dir}/pip_reqs_install.sh
 
 echo ".....pip reqs installed"