PS1 fixes

souvmaju-us · Jun 13, 2023 · 588e366 · 588e366
1 parent 975a06f
commit 588e366
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 21 deletions.
diff --git a/infra/main.bicep b/infra/main.bicep
@@ -248,9 +248,7 @@ module searchRoleBackend 'core/security/role.bicep' = {
   }
 }
 
-
 // For doc prep
-
 module docPrepResources 'docprep.bicep' = {
   name: 'docprep-resources'
   params: {

diff --git a/scripts/auth_init.ps1 b/scripts/auth_init.ps1
@@ -6,5 +6,5 @@ if (-not $pythonCmd) {
   $pythonCmd = Get-Command python3 -ErrorAction SilentlyContinue
 }
 
-Write-Host 'Running auth_update.py'
-Start-Process -FilePath ($pythonCmd).Source -ArgumentList "./scripts/prepdocs.py --appid $env:AUTH_APP_ID --uri $env:BACKEND_URI" -Wait -NoNewWindow
+Write-Host 'Running "auth_init.py"'
+Start-Process -FilePath ($pythonCmd).Source -ArgumentList "./scripts/auth_init.py --appid $env:AUTH_APP_ID" -Wait -NoNewWindow
diff --git a/scripts/auth_init.py b/scripts/auth_init.py
@@ -86,4 +86,3 @@ def update_azd_env(name, val):
     update_azd_env("AUTH_APP_ID", app_id)
     update_azd_env("AUTH_CLIENT_ID", client_id)
     update_azd_env("AUTH_CLIENT_SECRET", client_secret)
-
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"
+python3 ./scripts/auth_init.py --appid "$AUTH_APP_ID"
diff --git a/scripts/auth_update.ps1 b/scripts/auth_update.ps1
@@ -0,0 +1,10 @@
+. ./loadenv.ps1
+
+$pythonCmd = Get-Command python -ErrorAction SilentlyContinue
+if (-not $pythonCmd) {
+  # fallback to python3 if python not found
+  $pythonCmd = Get-Command python3 -ErrorAction SilentlyContinue
+}
+
+Write-Host 'Running "auth_update.py"'
+Start-Process -FilePath ($pythonCmd).Source -ArgumentList "./scripts/auth_update.py --appid $env:AUTH_APP_ID --uri $env:BACKEND_URI" -Wait -NoNewWindow
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"
+python3 ./scripts/auth_update.py --appid "$AUTH_APP_ID" --uri "$BACKEND_URI"
diff --git a/scripts/loadenv.sh b/scripts/loadenv.sh
@@ -5,4 +5,4 @@ while IFS='=' read -r key value; do
     export "$key=$value"
 done <<EOF
 $(azd env get-values)
-EOF
+EOF
diff --git a/scripts/prepdocs.ps1 b/scripts/prepdocs.ps1
@@ -1,16 +1,4 @@
-Write-Host "Loading azd .env file from current environment"
-
-$output = azd env get-values
-
-foreach ($line in $output) {
-  if (!$line.Contains('=')) {
-    continue
-  }
-
-  $name, $value = $line.Split("=")
-  $value = $value -replace '^\"|\"$'
-  [Environment]::SetEnvironmentVariable($name, $value)
-}
+. ./loadenv.ps1
 
 $pythonCmd = Get-Command python -ErrorAction SilentlyContinue
 if (-not $pythonCmd) {