Revert "remove symlinks and update scripts with paths relative to its own folder instead of cwd"

1yefuwang1 · 1yefuwang1 · commit 7e49c99540bb · 2024-09-13T05:37:58.000Z
This reverts commit 40287f2.
diff --git a/containerapps/app b/containerapps/app
@@ -0,0 +1 @@
+../app
diff --git a/containerapps/azure.yaml b/containerapps/azure.yaml
@@ -98,22 +98,22 @@ hooks:
     preprovision:
       windows:
         shell: pwsh
-        run: ../scripts/auth_init.ps1
+        run: ./scripts/auth_init.ps1
         interactive: true
         continueOnError: false
       posix:
         shell: sh
-        run: ../scripts/auth_init.sh
+        run: ./scripts/auth_init.sh
         interactive: true
         continueOnError: false
     postprovision:
       windows:
         shell: pwsh
-        run: ../scripts/auth_update.ps1; ../scripts/prepdocs.ps1
+        run: ./scripts/auth_update.ps1;./scripts/prepdocs.ps1
         interactive: true
         continueOnError: false
       posix:
         shell: sh
-        run: ../scripts/auth_update.sh; ../scripts/prepdocs.sh
+        run: ./scripts/auth_update.sh;./scripts/prepdocs.sh
         interactive: true
         continueOnError: false
diff --git a/containerapps/data b/containerapps/data
@@ -0,0 +1 @@
+../data
diff --git a/containerapps/scripts b/containerapps/scripts
@@ -0,0 +1 @@
+../scripts
diff --git a/scripts/adlsgen2setup.ps1 b/scripts/adlsgen2setup.ps1
@@ -1,7 +1,6 @@
 ## Set the preference to stop on the first error
 $ErrorActionPreference = "Stop"
 
-$projectRoot = Split-Path -Parent $PSScriptRoot
 & $PSScriptRoot\loadenv.ps1
 
 $venvPythonPath = "./.venv/scripts/python.exe"
@@ -16,4 +15,5 @@ if ([string]::IsNullOrEmpty($env:AZURE_ADLS_GEN2_STORAGE_ACCOUNT)) {
 }
 
 Write-Host 'Running "adlsgen2setup.py"'
-Start-Process -FilePath $venvPythonPath -ArgumentList "$projectRoot/scripts/adlsgen2setup.py `"$projectRoot/data`" --data-access-control $projectRoot/scripts/sampleacls.json --storage-account $env:AZURE_ADLS_GEN2_STORAGE_ACCOUNT -v" -Wait -NoNewWindow
+$cwd = (Get-Location)
+Start-Process -FilePath $venvPythonPath -ArgumentList "./scripts/adlsgen2setup.py `"$cwd/data`" --data-access-control ./scripts/sampleacls.json --storage-account $env:AZURE_ADLS_GEN2_STORAGE_ACCOUNT -v" -Wait -NoNewWindow
diff --git a/scripts/adlsgen2setup.sh b/scripts/adlsgen2setup.sh
@@ -1,11 +1,6 @@
  #!/bin/sh
 
-# Get the project root of the current script
-project_root="$(cd "$(dirname $(dirname $0))" && pwd)"
-script_dir="$project_root/scripts"
-data_dir="$project_root/data"
-
-. $script_dir/loadenv.sh
+. ./scripts/loadenv.sh
 
 if [ -n "$AZURE_ADLS_GEN2_STORAGE_ACCOUNT" ]; then
     echo 'AZURE_ADLS_GEN2_STORAGE_ACCOUNT must be set to continue'
@@ -14,4 +9,4 @@ fi
 
 echo 'Running "adlsgen2setup.py"'
 
-./.venv/bin/python $script_dir/adlsgen2setup.py "$data_dir/*" --data-access-control "$script_dir/sampleacls.json" --storage-account "$AZURE_ADLS_GEN2_STORAGE_ACCOUNT" -v
+./.venv/bin/python ./scripts/adlsgen2setup.py './data/*' --data-access-control './scripts/sampleacls.json' --storage-account "$AZURE_ADLS_GEN2_STORAGE_ACCOUNT" -v
diff --git a/scripts/auth_init.ps1 b/scripts/auth_init.ps1
@@ -1,16 +1,15 @@
-$projectRoot = Split-Path -Parent $PSScriptRoot
-. $projectRoot/scripts/load_azd_env.ps1
+. ./scripts/load_azd_env.ps1
 
 if (-not $env:AZURE_USE_AUTHENTICATION) {
   Exit 0
 }
 
-. $projectRoot/scripts/load_python_env.ps1
+. ./scripts/load_python_env.ps1
 
 $venvPythonPath = "./.venv/scripts/python.exe"
 if (Test-Path -Path "/usr") {
   # fallback to Linux venv path
   $venvPythonPath = "./.venv/bin/python"
 }
 
-Start-Process -FilePath $venvPythonPath -ArgumentList "$projectRoot/scripts/auth_init.py" -Wait -NoNewWindow
+Start-Process -FilePath $venvPythonPath -ArgumentList "./scripts/auth_init.py" -Wait -NoNewWindow
diff --git a/scripts/auth_init.sh b/scripts/auth_init.sh
@@ -1,13 +1,8 @@
  #!/bin/sh
 
-# Get the project root of the current script
-project_root="$(cd "$(dirname $(dirname $0))" && pwd)"
-script_dir="$project_root/scripts"
-data_dir="$project_root/data"
-
 echo "Checking if authentication should be setup..."
 
-. $script_dir/load_azd_env.sh
+. ./scripts/load_azd_env.sh
 
 if [ -z "$AZURE_USE_AUTHENTICATION" ]; then
   echo "AZURE_USE_AUTHENTICATION is not set, skipping authentication setup."
@@ -16,6 +11,6 @@ fi
 
 echo "AZURE_USE_AUTHENTICATION is set, proceeding with authentication setup..."
 
-. $script_dir/load_python_env.sh
+. ./scripts/load_python_env.sh
 
-./.venv/bin/python $script_dir/auth_init.py
+./.venv/bin/python ./scripts/auth_init.py
diff --git a/scripts/auth_update.ps1 b/scripts/auth_update.ps1
@@ -1,16 +1,15 @@
-$projectRoot = Split-Path -Parent $PSScriptRoot
-. $projectRoot/scripts/load_azd_env.ps1
+. ./scripts/load_azd_env.ps1
 
 if (-not $env:AZURE_USE_AUTHENTICATION) {
   Exit 0
 }
 
-. $projectRoot/scripts/load_python_env.ps1
+. ./scripts/load_python_env.ps1
 
 $venvPythonPath = "./.venv/scripts/python.exe"
 if (Test-Path -Path "/usr") {
   # fallback to Linux venv path
   $venvPythonPath = "./.venv/bin/python"
 }
 
-Start-Process -FilePath $venvPythonPath -ArgumentList "$projectRoot/scripts/auth_update.py" -Wait -NoNewWindow
+Start-Process -FilePath $venvPythonPath -ArgumentList "./scripts/auth_update.py" -Wait -NoNewWindow
diff --git a/scripts/auth_update.sh b/scripts/auth_update.sh
@@ -1,15 +1,11 @@
  #!/bin/sh
 
-# Get the project root of the current script
-project_root="$(cd "$(dirname $(dirname $0))" && pwd)"
-script_dir="$project_root/scripts"
-
-. $script_dir/load_azd_env.sh
+. ./scripts/load_azd_env.sh
 
 if [ -z "$AZURE_USE_AUTHENTICATION" ]; then
   exit 0
 fi
 
-. $script_dir/load_python_env.sh
+. ./scripts/load_python_env.sh
 
-./.venv/bin/python $script_dir/auth_update.py
+./.venv/bin/python ./scripts/auth_update.py
diff --git a/scripts/load_python_env.ps1 b/scripts/load_python_env.ps1
@@ -1,4 +1,3 @@
-$projectRoot = Split-Path -Parent $PSScriptRoot
 $pythonCmd = Get-Command python -ErrorAction SilentlyContinue
 if (-not $pythonCmd) {
   # fallback to python3 if python not found
@@ -15,4 +14,4 @@ if (Test-Path -Path "/usr") {
 }
 
 Write-Host 'Installing dependencies from "requirements.txt" into virtual environment'
-Start-Process -FilePath $venvPythonPath -ArgumentList "-m pip install -r $projectRoot/app/backend/requirements.txt" -Wait -NoNewWindow
+Start-Process -FilePath $venvPythonPath -ArgumentList "-m pip install -r app/backend/requirements.txt" -Wait -NoNewWindow
diff --git a/scripts/load_python_env.sh b/scripts/load_python_env.sh
@@ -1,11 +1,7 @@
-#!/bin/sh
-
-# Get the project root of the current script
-project_root="$(cd "$(dirname $(dirname $0))" && pwd)"
-app_dir="$project_root/app"
+ #!/bin/sh
 
 echo 'Creating Python virtual environment "app/backend/.venv"...'
 python3 -m venv .venv
 
 echo 'Installing dependencies from "requirements.txt" into virtual environment (in quiet mode)...'
-.venv/bin/python -m pip --quiet --disable-pip-version-check install -r $app_dir/backend/requirements.txt
+.venv/bin/python -m pip --quiet --disable-pip-version-check install -r app/backend/requirements.txt
diff --git a/scripts/loadenv.ps1 b/scripts/loadenv.ps1
@@ -1,5 +1,3 @@
-$projectRoot = Split-Path -Parent $PSScriptRoot
+./scripts/load_azd_env.ps1
 
-& $projectRoot/scripts/load_azd_env.ps1
-
-& $projectRoot/scripts/load_python_env.ps1
+./scripts/load_python_env.ps1
diff --git a/scripts/loadenv.sh b/scripts/loadenv.sh
@@ -1,9 +1,5 @@
  #!/bin/sh
 
-# Get the project root of the current script
-project_root="$(cd "$(dirname $(dirname $0))" && pwd)"
-script_dir="$project_root/scripts"
+. ./scripts/load_azd_env.sh
 
-. $script_dir/load_azd_env.sh
-
-. $script_dir/load_python_env.sh
+. ./scripts/load_python_env.sh
diff --git a/scripts/manageacl.ps1 b/scripts/manageacl.ps1
@@ -9,7 +9,5 @@ if (Test-Path -Path "/usr") {
   $venvPythonPath = "./.venv/bin/python"
 }
 
-$projectRoot = Split-Path -Parent $PSScriptRoot
-
 Write-Host "Running manageacl.py. Arguments to script: $args"
-Start-Process -FilePath $venvPythonPath -ArgumentList "$projectRoot/scripts/manageacl.py --search-service $env:AZURE_SEARCH_SERVICE --index $env:AZURE_SEARCH_INDEX $args" -Wait -NoNewWindow
+Start-Process -FilePath $venvPythonPath -ArgumentList "./scripts/manageacl.py --search-service $env:AZURE_SEARCH_SERVICE --index $env:AZURE_SEARCH_INDEX $args" -Wait -NoNewWindow
diff --git a/scripts/manageacl.sh b/scripts/manageacl.sh
@@ -1,10 +1,6 @@
  #!/bin/sh
 
-# Get the project root of the current script
-project_root="$(cd "$(dirname $(dirname $0))" && pwd)"
-script_dir="$project_root/scripts"
-
-. $script_dir/loadenv.sh
+. ./scripts/loadenv.sh
 
 echo "Running manageacl.py. Arguments to script: $@"
-  ./.venv/bin/python $script_dir/manageacl.py --search-service "$AZURE_SEARCH_SERVICE" --index "$AZURE_SEARCH_INDEX" $@
+  ./.venv/bin/python ./scripts/manageacl.py --search-service "$AZURE_SEARCH_SERVICE" --index "$AZURE_SEARCH_INDEX" $@
diff --git a/scripts/prepdocs.ps1 b/scripts/prepdocs.ps1
@@ -1,5 +1,4 @@
-$projectRoot = Split-Path -Parent $PSScriptRoot
-& $projectRoot/scripts/loadenv.ps1
+./scripts/loadenv.ps1
 
 $venvPythonPath = "./.venv/scripts/python.exe"
 if (Test-Path -Path "/usr") {
@@ -72,13 +71,14 @@ if ($env:AZURE_OPENAI_API_KEY_OVERRIDE) {
   $openaiApiKeyArg = "--openaikey $env:OPENAI_API_KEY"
 }
 
-$dataArg = "`"$projectRoot/data/*`""
+$cwd = (Get-Location)
+$dataArg = "`"$cwd/data/*`""
 $additionalArgs = ""
 if ($args) {
   $additionalArgs = "$args"
 }
 
-$argumentList = "$projectRoot/app/backend/prepdocs.py $dataArg --verbose " + `
+$argumentList = "./app/backend/prepdocs.py $dataArg --verbose " + `
 "--subscriptionid $env:AZURE_SUBSCRIPTION_ID " + `
 "--storageaccount $env:AZURE_STORAGE_ACCOUNT --container $env:AZURE_STORAGE_CONTAINER --storageresourcegroup $env:AZURE_STORAGE_RESOURCE_GROUP " + `
 "--searchservice $env:AZURE_SEARCH_SERVICE --index $env:AZURE_SEARCH_INDEX " + `
diff --git a/scripts/prepdocs.sh b/scripts/prepdocs.sh
@@ -1,11 +1,6 @@
  #!/bin/sh
 
-# Get the project root of the current script
-project_root="$(cd "$(dirname $(dirname $0))" && pwd)"
-script_dir="$project_root/scripts"
-data_dir="$project_root/data"
-
-. $script_dir/loadenv.sh
+. ./scripts/loadenv.sh
 
 echo 'Running "prepdocs.py"'
 
@@ -79,8 +74,7 @@ if [ $# -gt 0 ]; then
   additionalArgs="$@"
 fi
 
-
-./.venv/bin/python $app_dir/backend/prepdocs.py "$data_dir/*" --verbose \
+./.venv/bin/python ./app/backend/prepdocs.py './data/*' --verbose \
 --subscriptionid $AZURE_SUBSCRIPTION_ID  \
 --storageaccount "$AZURE_STORAGE_ACCOUNT" --container "$AZURE_STORAGE_CONTAINER" --storageresourcegroup $AZURE_STORAGE_RESOURCE_GROUP \
 --searchservice "$AZURE_SEARCH_SERVICE" --index "$AZURE_SEARCH_INDEX" \
