make windows scripts more flexible (indep of where called from)

dec1 · May 20, 2024 · ea1c311 · ea1c311
1 parent e491225
commit ea1c311
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 10 deletions.
diff --git a/prj/script/pip_reqs_export.cmd b/prj/script/pip_reqs_export.cmd
@@ -1,2 +1,4 @@
+SET "script_dir=%~dp0"
+SET "script_dir=%script_dir:~0,-1%"   
 
-CALL .\venv\Scripts\pip freeze > ..\pip_reqs.txt
+CALL %script_dir%\venv\Scripts\pip freeze > ..\pip_reqs.txt
diff --git a/prj/script/pip_reqs_install.cmd b/prj/script/pip_reqs_install.cmd
@@ -1,13 +1,15 @@
+SET "script_dir=%~dp0"
+SET "script_dir=%script_dir:~0,-1%"   
 
-CALL .\venv\Scripts\python -m pip install --upgrade pip
-CALl .\venv\Scripts\pip install --upgrade setuptools
+CALL %script_dir%\venv\Scripts\python -m pip install --upgrade pip
+CALl %script_dir%\venv\Scripts\pip install --upgrade setuptools
 
 
 REM Latest
 REM ------
 REM install (latest versions of) dependencies
 REM ------
-CAll .\venv\Scripts\pip install -r ..\pip_reqs_base.txt
+CAll %script_dir%\venv\Scripts\pip install -r ..\pip_reqs_base.txt
 
 REM Exact
 REM ------

diff --git a/prj/script/venv_create.cmd b/prj/script/venv_create.cmd
@@ -1,19 +1,21 @@
-set HTTPS_PROXY=
-REM http://10.110.15.6:8080
+REM set HTTPS_PROXY= http://10.110.15.6:8080
 
-CALL python -m venv .\venv
+SET "script_dir=%~dp0"
+SET "script_dir=%script_dir:~0,-1%"   
+
+CALL python -m venv %script_dir%\venv
 
 echo ".....virtual environment created"
 
-CALL .\venv\Scripts\activate
+CALL %script_dir%\venv\Scripts\activate
 
 echo ".....pip reqs installing...."
 
-CALL  .\pip_reqs_install.cmd
+CALL  %script_dir%\pip_reqs_install.cmd
 
 echo ".....pip reqs installed"
 
-CALL .\venv\Scripts\deactivate
+CALL %script_dir%\\venv\Scripts\deactivate
 
 echo ".....venv ready"