From 30b3cdadbf05e7e12ae98b56ee088d33d0063e90 Mon Sep 17 00:00:00 2001
From: Chava Barboza <salvador-barboza@users.noreply.github.com>
Date: Fri, 18 Jul 2025 17:48:45 +0000
Subject: [PATCH 1/9] add new flow

---
 .devcontainer/onCreate.sh         |  4 +++-
 .devcontainer/postStartCommand.sh | 26 ++++++++++++++++++--------
 .devcontainer/refreshTools.sh     | 15 ++++++---------
 3 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/.devcontainer/onCreate.sh b/.devcontainer/onCreate.sh
index 1cb26c6..e7bd799 100755
--- a/.devcontainer/onCreate.sh
+++ b/.devcontainer/onCreate.sh
@@ -22,7 +22,9 @@ sudo mv "$azcopy_dir/azcopy" /usr/local/bin/azcopy
 sudo rm -rf "$azcopy_dir"
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-"$SCRIPT_DIR/refreshTools.sh"
+LATEST_RELEASE=$(bash "$SCRIPT_DIR/refreshTools.sh")
+LATEST_RELEASE="$LATEST_RELEASE" WORKSPACE_DIR="$WORKSPACE_DIR" bash spark-sdk-dist/install-tools.sh services
+
 
 echo "Pre-starting the server and generating the optimized assets"
 npm run optimize --override
diff --git a/.devcontainer/postStartCommand.sh b/.devcontainer/postStartCommand.sh
index be5d3b1..fab2c64 100755
--- a/.devcontainer/postStartCommand.sh
+++ b/.devcontainer/postStartCommand.sh
@@ -1,7 +1,20 @@
 #!/bin/bash
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-bash "$SCRIPT_DIR/refreshTools.sh"
+LATEST_RELEASE=$(bash "$SCRIPT_DIR/refreshTools.sh")
+
+bash spark-sdk-dist/repair.sh
+
+LATEST_RELEASE="$LATEST_RELEASE" WORKSPACE_DIR="$WORKSPACE_DIR" bash spark-sdk-dist/install-tools.sh services
+
+sudo cp .devcontainer/spark.conf /etc/supervisor/conf.d/
+
+sudo chown node /var/run/
+sudo chown -R node /var/log/
+
+supervisord
+supervisorctl reread
+supervisorctl update
 
 # Check if SNAPSHOT_SAS_URL was passed, if so run hydrate.sh
 if [ -n "$SNAPSHOT_SAS_URL" ]; then
@@ -9,19 +22,16 @@ if [ -n "$SNAPSHOT_SAS_URL" ]; then
     SAS_URI="$SNAPSHOT_SAS_URL" /usr/local/bin/hydrate.sh $WORKSPACE_DIR
 fi
 
+LATEST_RELEASE="$RELEASE_ID" WORKSPACE_DIR="$WORKSPACE_DIR" bash spark-sdk-dist/install-tools.sh sdk
+
 # Keep reflog commits "forever"
 git config gc.reflogExpire 500.years.ago
 git config gc.reflogExpireUnreachable 500.years.ago
 
-sudo cp .devcontainer/spark.conf /etc/supervisor/conf.d/
-
-sudo chown node /var/run/
-sudo chown -R node /var/log/
 
-supervisord
-supervisorctl reread
-supervisorctl update
 
 # Set up post-commit hook and also run the build script to perform a one-time build for static preview
 ln -fs /usr/local/bin/post-commit .git/hooks/post-commit
 /usr/local/bin/static-preview-build.sh
+
+LATEST_RELEASE="$RELEASE_ID" WORKSPACE_DIR="$WORKSPACE_DIR" bash spark-sdk-dist/install-tools.sh cli
diff --git a/.devcontainer/refreshTools.sh b/.devcontainer/refreshTools.sh
index f960469..b923808 100755
--- a/.devcontainer/refreshTools.sh
+++ b/.devcontainer/refreshTools.sh
@@ -2,22 +2,19 @@
 
 set -e
 
-echo "Checking for updates..."
-
 WORKSPACE_DIR="/workspaces/spark-template"
 LATEST_RELEASE=$(curl -s https://api.github.com/repos/github/spark-template/releases/latest)
-echo "New version found. Downloading latest release."
+RELEASE_ID=$(echo "$LATEST_RELEASE" | jq -r '.id')
+
 
-TEMP_DIR=$(mktemp -d)
-cd $TEMP_DIR
+TEMP_DIR=/tmp/spark
+rm -rf $TEMP_DIR
+mkdir -p $TEMP_DIR
 
 DOWNLOAD_URL=$(echo "$LATEST_RELEASE" | jq -r '.assets[0].url')
 curl -L -o dist.zip -H "Accept: application/octet-stream" "$DOWNLOAD_URL"
 
 unzip -o dist.zip
 rm dist.zip
-DIST_DIR="spark-sdk-dist"
 
-bash spark-sdk-dist/repair.sh
-LATEST_RELEASE="$LATEST_RELEASE" DIST_DIR="$DIST_DIR" WORKSPACE_DIR="$WORKSPACE_DIR" bash spark-sdk-dist/install-tools.sh
-rm -rf $TEMP_DIR
\ No newline at end of file
+echo $RELEASE_ID
\ No newline at end of file

From 032ea0e39a72b1cd723c234e3dfd81166d8ef65f Mon Sep 17 00:00:00 2001
From: Chava Barboza <salvador-barboza@users.noreply.github.com>
Date: Fri, 18 Jul 2025 17:56:13 +0000
Subject: [PATCH 2/9] fix

---
 .devcontainer/onCreate.sh         | 2 +-
 .devcontainer/postStartCommand.sh | 6 +++---
 .devcontainer/refreshTools.sh     | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.devcontainer/onCreate.sh b/.devcontainer/onCreate.sh
index e7bd799..837c3aa 100755
--- a/.devcontainer/onCreate.sh
+++ b/.devcontainer/onCreate.sh
@@ -23,7 +23,7 @@ sudo rm -rf "$azcopy_dir"
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 LATEST_RELEASE=$(bash "$SCRIPT_DIR/refreshTools.sh")
-LATEST_RELEASE="$LATEST_RELEASE" WORKSPACE_DIR="$WORKSPACE_DIR" bash spark-sdk-dist/install-tools.sh services
+LATEST_RELEASE="$LATEST_RELEASE" WORKSPACE_DIR="$WORKSPACE_DIR" bash /tmp/spark/spark-sdk-dist/install-tools.sh services
 
 
 echo "Pre-starting the server and generating the optimized assets"
diff --git a/.devcontainer/postStartCommand.sh b/.devcontainer/postStartCommand.sh
index fab2c64..9275dbf 100755
--- a/.devcontainer/postStartCommand.sh
+++ b/.devcontainer/postStartCommand.sh
@@ -5,7 +5,7 @@ LATEST_RELEASE=$(bash "$SCRIPT_DIR/refreshTools.sh")
 
 bash spark-sdk-dist/repair.sh
 
-LATEST_RELEASE="$LATEST_RELEASE" WORKSPACE_DIR="$WORKSPACE_DIR" bash spark-sdk-dist/install-tools.sh services
+LATEST_RELEASE="$LATEST_RELEASE" WORKSPACE_DIR="$WORKSPACE_DIR" bash /tmp/sparkspark-sdk-dist/install-tools.sh services
 
 sudo cp .devcontainer/spark.conf /etc/supervisor/conf.d/
 
@@ -22,7 +22,7 @@ if [ -n "$SNAPSHOT_SAS_URL" ]; then
     SAS_URI="$SNAPSHOT_SAS_URL" /usr/local/bin/hydrate.sh $WORKSPACE_DIR
 fi
 
-LATEST_RELEASE="$RELEASE_ID" WORKSPACE_DIR="$WORKSPACE_DIR" bash spark-sdk-dist/install-tools.sh sdk
+LATEST_RELEASE="$RELEASE_ID" WORKSPACE_DIR="$WORKSPACE_DIR" bash /tmp/spark/spark-sdk-dist/install-tools.sh sdk
 
 # Keep reflog commits "forever"
 git config gc.reflogExpire 500.years.ago
@@ -34,4 +34,4 @@ git config gc.reflogExpireUnreachable 500.years.ago
 ln -fs /usr/local/bin/post-commit .git/hooks/post-commit
 /usr/local/bin/static-preview-build.sh
 
-LATEST_RELEASE="$RELEASE_ID" WORKSPACE_DIR="$WORKSPACE_DIR" bash spark-sdk-dist/install-tools.sh cli
+LATEST_RELEASE="$RELEASE_ID" WORKSPACE_DIR="$WORKSPACE_DIR" bash /tmp/spark/spark-sdk-dist/install-tools.sh cli
diff --git a/.devcontainer/refreshTools.sh b/.devcontainer/refreshTools.sh
index b923808..ce2aea6 100755
--- a/.devcontainer/refreshTools.sh
+++ b/.devcontainer/refreshTools.sh
@@ -12,9 +12,9 @@ rm -rf $TEMP_DIR
 mkdir -p $TEMP_DIR
 
 DOWNLOAD_URL=$(echo "$LATEST_RELEASE" | jq -r '.assets[0].url')
-curl -L -o dist.zip -H "Accept: application/octet-stream" "$DOWNLOAD_URL"
+curl -L -o "$TEMP_DIR/dist.zip" -H "Accept: application/octet-stream" "$DOWNLOAD_URL"
 
-unzip -o dist.zip
-rm dist.zip
+unzip -o "$TEMP_DIR/dist.zip" -d "$TEMP_DIR"
+rm "$TEMP_DIR/dist.zip"
 
-echo $RELEASE_ID
\ No newline at end of file
+echo "$RELEASE_ID"
\ No newline at end of file

From 3e7cf76e11a5bf8dae334a434235200fbb07c60c Mon Sep 17 00:00:00 2001
From: Chava Barboza <salvador-barboza@users.noreply.github.com>
Date: Fri, 18 Jul 2025 18:01:04 +0000
Subject: [PATCH 3/9] add sdk

---
 .devcontainer/onCreate.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.devcontainer/onCreate.sh b/.devcontainer/onCreate.sh
index 837c3aa..55b370e 100755
--- a/.devcontainer/onCreate.sh
+++ b/.devcontainer/onCreate.sh
@@ -21,6 +21,7 @@ azcopy_dir=$(find /usr/local/bin/ -type d -name "azcopy*" | head -n 1)
 sudo mv "$azcopy_dir/azcopy" /usr/local/bin/azcopy
 sudo rm -rf "$azcopy_dir"
 
+echo "Installing sdk"
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 LATEST_RELEASE=$(bash "$SCRIPT_DIR/refreshTools.sh")
 LATEST_RELEASE="$LATEST_RELEASE" WORKSPACE_DIR="$WORKSPACE_DIR" bash /tmp/spark/spark-sdk-dist/install-tools.sh services

From 8f3413b16b4ebc3e171d2acb63f7a77f21af78c4 Mon Sep 17 00:00:00 2001
From: Chava Barboza <salvador-barboza@users.noreply.github.com>
Date: Fri, 18 Jul 2025 18:07:03 +0000
Subject: [PATCH 4/9] fix

---
 .devcontainer/onCreate.sh         | 6 ++++--
 .devcontainer/postStartCommand.sh | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.devcontainer/onCreate.sh b/.devcontainer/onCreate.sh
index 55b370e..34bb94e 100755
--- a/.devcontainer/onCreate.sh
+++ b/.devcontainer/onCreate.sh
@@ -22,11 +22,13 @@ sudo mv "$azcopy_dir/azcopy" /usr/local/bin/azcopy
 sudo rm -rf "$azcopy_dir"
 
 echo "Installing sdk"
+
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 LATEST_RELEASE=$(bash "$SCRIPT_DIR/refreshTools.sh")
-LATEST_RELEASE="$LATEST_RELEASE" WORKSPACE_DIR="$WORKSPACE_DIR" bash /tmp/spark/spark-sdk-dist/install-tools.sh services
-
+cd /tmp/spark
+LATEST_RELEASE="$LATEST_RELEASE" WORKSPACE_DIR="$WORKSPACE_DIR" bash spark-sdk-dist/install-tools.sh
 
+cd /workspaces/spark-template
 echo "Pre-starting the server and generating the optimized assets"
 npm run optimize --override
 
diff --git a/.devcontainer/postStartCommand.sh b/.devcontainer/postStartCommand.sh
index 9275dbf..47b2701 100755
--- a/.devcontainer/postStartCommand.sh
+++ b/.devcontainer/postStartCommand.sh
@@ -3,8 +3,8 @@
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 LATEST_RELEASE=$(bash "$SCRIPT_DIR/refreshTools.sh")
 
+cd /tmp/spark
 bash spark-sdk-dist/repair.sh
-
 LATEST_RELEASE="$LATEST_RELEASE" WORKSPACE_DIR="$WORKSPACE_DIR" bash /tmp/sparkspark-sdk-dist/install-tools.sh services
 
 sudo cp .devcontainer/spark.conf /etc/supervisor/conf.d/
@@ -16,6 +16,7 @@ supervisord
 supervisorctl reread
 supervisorctl update
 
+cd /workspaces/spark-template
 # Check if SNAPSHOT_SAS_URL was passed, if so run hydrate.sh
 if [ -n "$SNAPSHOT_SAS_URL" ]; then
     WORKSPACE_DIR="/workspaces/spark-template"

From c3726cb880c5e42d537406bfb78eea600c7c230e Mon Sep 17 00:00:00 2001
From: Chava Barboza <salvador-barboza@users.noreply.github.com>
Date: Fri, 18 Jul 2025 18:08:36 +0000
Subject: [PATCH 5/9] fix

---
 .devcontainer/postStartCommand.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.devcontainer/postStartCommand.sh b/.devcontainer/postStartCommand.sh
index 47b2701..094cbcc 100755
--- a/.devcontainer/postStartCommand.sh
+++ b/.devcontainer/postStartCommand.sh
@@ -5,7 +5,7 @@ LATEST_RELEASE=$(bash "$SCRIPT_DIR/refreshTools.sh")
 
 cd /tmp/spark
 bash spark-sdk-dist/repair.sh
-LATEST_RELEASE="$LATEST_RELEASE" WORKSPACE_DIR="$WORKSPACE_DIR" bash /tmp/sparkspark-sdk-dist/install-tools.sh services
+LATEST_RELEASE="$LATEST_RELEASE" WORKSPACE_DIR="$WORKSPACE_DIR" bash /tmp/spark/spark-sdk-dist/install-tools.sh services
 
 sudo cp .devcontainer/spark.conf /etc/supervisor/conf.d/
 

From 3188e03fbaf5543c7d74568a9c24aeae8c5fbc5e Mon Sep 17 00:00:00 2001
From: Chava Barboza <salvador-barboza@users.noreply.github.com>
Date: Fri, 18 Jul 2025 18:09:44 +0000
Subject: [PATCH 6/9] fix

---
 .devcontainer/postStartCommand.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.devcontainer/postStartCommand.sh b/.devcontainer/postStartCommand.sh
index 094cbcc..d203d2f 100755
--- a/.devcontainer/postStartCommand.sh
+++ b/.devcontainer/postStartCommand.sh
@@ -3,12 +3,12 @@
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 LATEST_RELEASE=$(bash "$SCRIPT_DIR/refreshTools.sh")
 
+sudo cp .devcontainer/spark.conf /etc/supervisor/conf.d/
+
 cd /tmp/spark
 bash spark-sdk-dist/repair.sh
 LATEST_RELEASE="$LATEST_RELEASE" WORKSPACE_DIR="$WORKSPACE_DIR" bash /tmp/spark/spark-sdk-dist/install-tools.sh services
 
-sudo cp .devcontainer/spark.conf /etc/supervisor/conf.d/
-
 sudo chown node /var/run/
 sudo chown -R node /var/log/
 

From 676646738f9b93b685879e37124d4370f0310a52 Mon Sep 17 00:00:00 2001
From: Chava Barboza <salvador-barboza@users.noreply.github.com>
Date: Fri, 18 Jul 2025 18:12:28 +0000
Subject: [PATCH 7/9] fix

---
 .devcontainer/postStartCommand.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.devcontainer/postStartCommand.sh b/.devcontainer/postStartCommand.sh
index d203d2f..09470a3 100755
--- a/.devcontainer/postStartCommand.sh
+++ b/.devcontainer/postStartCommand.sh
@@ -8,6 +8,7 @@ sudo cp .devcontainer/spark.conf /etc/supervisor/conf.d/
 cd /tmp/spark
 bash spark-sdk-dist/repair.sh
 LATEST_RELEASE="$LATEST_RELEASE" WORKSPACE_DIR="$WORKSPACE_DIR" bash /tmp/spark/spark-sdk-dist/install-tools.sh services
+cd /workspaces/spark-template
 
 sudo chown node /var/run/
 sudo chown -R node /var/log/
@@ -16,14 +17,15 @@ supervisord
 supervisorctl reread
 supervisorctl update
 
-cd /workspaces/spark-template
 # Check if SNAPSHOT_SAS_URL was passed, if so run hydrate.sh
 if [ -n "$SNAPSHOT_SAS_URL" ]; then
     WORKSPACE_DIR="/workspaces/spark-template"
     SAS_URI="$SNAPSHOT_SAS_URL" /usr/local/bin/hydrate.sh $WORKSPACE_DIR
 fi
 
+cd /tmp/spark
 LATEST_RELEASE="$RELEASE_ID" WORKSPACE_DIR="$WORKSPACE_DIR" bash /tmp/spark/spark-sdk-dist/install-tools.sh sdk
+cd /workspaces/spark-template
 
 # Keep reflog commits "forever"
 git config gc.reflogExpire 500.years.ago
@@ -35,4 +37,6 @@ git config gc.reflogExpireUnreachable 500.years.ago
 ln -fs /usr/local/bin/post-commit .git/hooks/post-commit
 /usr/local/bin/static-preview-build.sh
 
+cd /tmp/spark
 LATEST_RELEASE="$RELEASE_ID" WORKSPACE_DIR="$WORKSPACE_DIR" bash /tmp/spark/spark-sdk-dist/install-tools.sh cli
+cd /workspaces/spark-template

From e0eea8e1f19b0d0c7634d6f0d720c2e4bd029111 Mon Sep 17 00:00:00 2001
From: Chava Barboza <salvador-barboza@users.noreply.github.com>
Date: Fri, 18 Jul 2025 16:19:01 -0400
Subject: [PATCH 8/9] Update .devcontainer/postStartCommand.sh

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 .devcontainer/postStartCommand.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.devcontainer/postStartCommand.sh b/.devcontainer/postStartCommand.sh
index 09470a3..90c85ed 100755
--- a/.devcontainer/postStartCommand.sh
+++ b/.devcontainer/postStartCommand.sh
@@ -24,7 +24,7 @@ if [ -n "$SNAPSHOT_SAS_URL" ]; then
 fi
 
 cd /tmp/spark
-LATEST_RELEASE="$RELEASE_ID" WORKSPACE_DIR="$WORKSPACE_DIR" bash /tmp/spark/spark-sdk-dist/install-tools.sh sdk
+LATEST_RELEASE="$LATEST_RELEASE" WORKSPACE_DIR="$WORKSPACE_DIR" bash /tmp/spark/spark-sdk-dist/install-tools.sh sdk
 cd /workspaces/spark-template
 
 # Keep reflog commits "forever"

From bc3673dc0c237690be98981053f15364fdc47d00 Mon Sep 17 00:00:00 2001
From: Chava Barboza <salvador-barboza@users.noreply.github.com>
Date: Fri, 18 Jul 2025 16:19:13 -0400
Subject: [PATCH 9/9] Update .devcontainer/postStartCommand.sh

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 .devcontainer/postStartCommand.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.devcontainer/postStartCommand.sh b/.devcontainer/postStartCommand.sh
index 90c85ed..03a4e92 100755
--- a/.devcontainer/postStartCommand.sh
+++ b/.devcontainer/postStartCommand.sh
@@ -38,5 +38,5 @@ ln -fs /usr/local/bin/post-commit .git/hooks/post-commit
 /usr/local/bin/static-preview-build.sh
 
 cd /tmp/spark
-LATEST_RELEASE="$RELEASE_ID" WORKSPACE_DIR="$WORKSPACE_DIR" bash /tmp/spark/spark-sdk-dist/install-tools.sh cli
+LATEST_RELEASE="$LATEST_RELEASE" WORKSPACE_DIR="$WORKSPACE_DIR" bash /tmp/spark/spark-sdk-dist/install-tools.sh cli
 cd /workspaces/spark-template