Use venv for shell scripts as well, fix local dev

iNewmanity · Jun 20, 2023 · 26f37b1 · 26f37b1
1 parent 1ea7c08
commit 26f37b1
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 9 deletions.
diff --git a/azure.yaml b/azure.yaml
@@ -35,11 +35,11 @@ hooks:
     postprovision:
       windows:
         shell: pwsh
-        run: ./scripts/auth_update.ps1;./scripts/prepdocs.ps1; $output = azd env get-values; Add-Content -Path .env -Value $output;
+        run: ./scripts/auth_update.ps1;./scripts/prepdocs.ps1;
         interactive: true
         continueOnError: false
       posix:
         shell: sh
-        run: ./scripts/auth_update.sh;./scripts/prepdocs.sh;azd env get-values > .env
+        run: ./scripts/auth_update.sh;./scripts/prepdocs.sh;
         interactive: true
         continueOnError: false
diff --git a/scripts/auth_init.sh b/scripts/auth_init.sh
@@ -3,4 +3,4 @@
 . ./scripts/loadenv.sh
 
 echo 'Running "auth_init.py"'
-python3 ./scripts/auth_init.py --appid "$AUTH_APP_ID"
+./.venv/bin/python ./scripts/auth_init.py --appid "$AUTH_APP_ID"
diff --git a/scripts/auth_update.sh b/scripts/auth_update.sh
@@ -3,4 +3,4 @@
 . ./scripts/loadenv.sh
 
 echo 'Running "auth_update.py"'
-python3 ./scripts/auth_update.py --appid "$AUTH_APP_ID" --uri "$BACKEND_URI"
+./.venv/bin/python ./scripts/auth_update.py --appid "$AUTH_APP_ID" --uri "$BACKEND_URI"
diff --git a/scripts/loadenv.sh b/scripts/loadenv.sh
@@ -8,7 +8,7 @@ $(azd env get-values)
 EOF
 
 echo 'Creating Python virtual environment ".venv" in root'
-python -m venv .venv
+python3 -m venv .venv
 
 echo 'Installing dependencies from "requirements.txt" into virtual environment'
-.venv/bin/python -m pip install -r requirements-dev.txt
+./.venv/bin/python -m pip install -r requirements-dev.txt
diff --git a/scripts/prepdocs.sh b/scripts/prepdocs.sh
@@ -3,4 +3,4 @@
 . ./scripts/loadenv.sh
 
 echo 'Running "prepdocs.py"'
-python3 ./scripts/prepdocs.py --searchservice "$AZURE_SEARCH_SERVICE" --index "$AZURE_SEARCH_INDEX" --formrecognizerservice "$AZURE_FORMRECOGNIZER_SERVICE" --tenantid "$AZURE_TENANT_ID"
+./.venv/bin/python ./scripts/prepdocs.py --searchservice "$AZURE_SEARCH_SERVICE" --index "$AZURE_SEARCH_INDEX" --formrecognizerservice "$AZURE_FORMRECOGNIZER_SERVICE" --tenantid "$AZURE_TENANT_ID"
diff --git a/start.sh b/start.sh
@@ -19,11 +19,13 @@ if [ $? -ne 0 ]; then
     exit $?
 fi
 
+cd ..
+. ./scripts/loadenv.sh
+
 echo ""
 echo "Starting backend"
 echo ""
-cd ..
-python3 -m flask run --port=5000 --host=127.0.0.1 --reload --debug
+./.venv/bin/python  -m flask run --port=5000 --host=127.0.0.1 --reload --debug
 if [ $? -ne 0 ]; then
     echo "Failed to start backend"
     exit $?