From 129d69258d7f03f4a06a2ecefdcb3a8183a19f18 Mon Sep 17 00:00:00 2001
From: Steven Masley <stevenmasley@gmail.com>
Date: Thu, 29 Aug 2024 14:55:03 -0500
Subject: [PATCH] do not use the same var name for env var

---
 code-server/main.tf | 2 +-
 vscode-web/run.sh   | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/code-server/main.tf b/code-server/main.tf
index 59e1960..6f9b328 100644
--- a/code-server/main.tf
+++ b/code-server/main.tf
@@ -143,7 +143,7 @@ resource "coder_script" "code-server" {
     AUTO_INSTALL_EXTENSIONS : var.auto_install_extensions,
     # SERVER_BASE_PATH : "/",
     SERVER_BASE_PATH : format("/%s/%s.%s/apps/vscode-web/",
-    data.coder_workspace_owner.name, data.coder_workspace.name, "main"),
+    data.coder_workspace_owner.name, data.coder_workspace.name, var.agent_id),
   })
   run_on_start = true
 
diff --git a/vscode-web/run.sh b/vscode-web/run.sh
index 8ee11bf..651e126 100755
--- a/vscode-web/run.sh
+++ b/vscode-web/run.sh
@@ -11,15 +11,15 @@ if [ -n "${EXTENSIONS_DIR}" ]; then
 fi
 
 # Set extension directory
-SERVER_BASE_PATH=""
+SERVER_BASE_PATH_ARG=""
 if [ -n "${SERVER_BASE_PATH}" ]; then
-  SERVER_BASE_PATH="--server-base-path=${SERVER_BASE_PATH}"
+  SERVER_BASE_PATH_ARG="--server-base-path=${SERVER_BASE_PATH}"
 fi
 
 run_vscode_web() {
-  echo "👷 Running $VSCODE_WEB serve-local $EXTENSION_ARG $SERVER_BASE_PATH --port ${PORT} --host 127.0.0.1 --accept-server-license-terms --without-connection-token --telemetry-level ${TELEMETRY_LEVEL} in the background..."
+  echo "👷 Running $VSCODE_WEB serve-local $EXTENSION_ARG $SERVER_BASE_PATH_ARG --port ${PORT} --host 127.0.0.1 --accept-server-license-terms --without-connection-token --telemetry-level ${TELEMETRY_LEVEL} in the background..."
   echo "Check logs at ${LOG_PATH}!"
-  "$VSCODE_WEB" serve-local "$EXTENSION_ARG" "$SERVER_BASE_PATH" --port "${PORT}" --host 127.0.0.1 --accept-server-license-terms --without-connection-token --telemetry-level "${TELEMETRY_LEVEL}" > "${LOG_PATH}" 2>&1 &
+  "$VSCODE_WEB" serve-local "$EXTENSION_ARG" "$SERVER_BASE_PATH_ARG" --port "${PORT}" --host 127.0.0.1 --accept-server-license-terms --without-connection-token --telemetry-level "${TELEMETRY_LEVEL}" > "${LOG_PATH}" 2>&1 &
 }
 
 # Check if the settings file exists...