From c899ac69a4c09f6ac0d2a6d0593f87d70fbaa375 Mon Sep 17 00:00:00 2001
From: Roxedus <me@roxedus.dev>
Date: Thu, 18 May 2023 23:26:21 +0200
Subject: [PATCH] Use Workspace var

---
 .../s6-overlay/s6-rc.d/init-vscode-server/run |  7 +++++--
 .../s6-rc.d/svc-vscode-server-web/run         | 19 +++++++++----------
 .../s6-overlay/s6-rc.d/svc-vscode-server/run  | 13 +++++++------
 3 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/root/etc/s6-overlay/s6-rc.d/init-vscode-server/run b/root/etc/s6-overlay/s6-rc.d/init-vscode-server/run
index f9bb290..73028d2 100755
--- a/root/etc/s6-overlay/s6-rc.d/init-vscode-server/run
+++ b/root/etc/s6-overlay/s6-rc.d/init-vscode-server/run
@@ -1,8 +1,11 @@
 #!/usr/bin/with-contenv bash
 # shellcheck shell=bash
 
-mkdir -p /config/{.vscode-headless,.config,.ssh}
-mkdir -p /run/dbus
+mkdir -p /config/{.vscode-headless,.config,.ssh,workspace}
+
+if [ ! -d "${DEFAULT_WORKSPACE}" ];then
+    echo -n "/config/workspace" >/run/s6/container_environment/DEFAULT_WORKSPACE
+fi
 
 if [ -n "${SUDO_PASSWORD}" ] || [ -n "${SUDO_PASSWORD_HASH}" ]; then
     echo "setting up sudo access"
diff --git a/root/etc/s6-overlay/s6-rc.d/svc-vscode-server-web/run b/root/etc/s6-overlay/s6-rc.d/svc-vscode-server-web/run
index d02ded7..37b4bd8 100755
--- a/root/etc/s6-overlay/s6-rc.d/svc-vscode-server-web/run
+++ b/root/etc/s6-overlay/s6-rc.d/svc-vscode-server-web/run
@@ -1,9 +1,7 @@
 #!/usr/bin/with-contenv bash
 # shellcheck shell=bash
 
-until [[ -e /run/dbus/system_bus_socket ]]; do
-    sleep 1s
-done
+env | sort > /svc-env
 
 if [ -n "$CONNECTION_SECRET" ]; then
     CODE_LOCAL_ARGS="${CODE_LOCAL_ARGS} --connection-token-file ${CONNECTION_SECRET}"
@@ -17,10 +15,11 @@ fi
 
 exec \
     s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z 127.0.0.1 8000" \
-        s6-setuidgid abc \
-            /usr/local/bin/code-server serve-local \
-                --accept-server-license-terms\
-                --quality insiders \
-                --host 0.0.0.0 \
-                --disable-telemetry \
-                ${CODE_LOCAL_ARGS}
+        cd "$DEFAULT_WORKSPACE" \
+            s6-setuidgid abc \
+                /usr/local/bin/code-server serve-local \
+                    --accept-server-license-terms\
+                    --quality insiders \
+                    --host 0.0.0.0 \
+                    --disable-telemetry \
+                    ${CODE_LOCAL_ARGS}
diff --git a/root/etc/s6-overlay/s6-rc.d/svc-vscode-server/run b/root/etc/s6-overlay/s6-rc.d/svc-vscode-server/run
index 67586b3..a5809aa 100755
--- a/root/etc/s6-overlay/s6-rc.d/svc-vscode-server/run
+++ b/root/etc/s6-overlay/s6-rc.d/svc-vscode-server/run
@@ -6,9 +6,10 @@ until [[ -e /run/dbus/system_bus_socket ]]; do
 done
 
 exec \
-    s6-setuidgid abc \
-        /usr/local/bin/code-server serve \
-            --accept-server-license-terms \
-            --random-name \
-            --disable-telemetry\
-                ${CODE_ARGS}
+    cd "$DEFAULT_WORKSPACE" \
+        s6-setuidgid abc \
+            /usr/local/bin/code-server serve \
+                --accept-server-license-terms \
+                --random-name \
+                --disable-telemetry \
+                ${CODE_ARGS} || exit 1