From 0e99d4af512ff271303375172376b3ae49d3c5a7 Mon Sep 17 00:00:00 2001
From: Richard Sperry <Richard@SperryFamily.net>
Date: Wed, 16 Apr 2025 19:48:29 -0700
Subject: [PATCH] devenv

---
 vscode/rootfs/etc/s6-overlay/s6-rc.d/code-server/run  |  1 +
 .../etc/s6-overlay/s6-rc.d/init-code-server/run       | 11 +++++------
 .../etc/s6-overlay/s6-rc.d/init-custom-bash/run       |  2 --
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/vscode/rootfs/etc/s6-overlay/s6-rc.d/code-server/run b/vscode/rootfs/etc/s6-overlay/s6-rc.d/code-server/run
index d7b5150..aa93929 100644
--- a/vscode/rootfs/etc/s6-overlay/s6-rc.d/code-server/run
+++ b/vscode/rootfs/etc/s6-overlay/s6-rc.d/code-server/run
@@ -16,4 +16,5 @@ readonly CODE_SERVER_WORKSPACE_FILE="$CODE_SERVER_WORKSPACE_DIR/SERVER.code-work
 
 # Run the code server
 echo CODE_SERVER_WORKSPACE_FILE "$CODE_SERVER_WORKSPACE_FILE"
+cd "$CODE_SERVER_WORKSPACE_DIR" ||     bashio::exit.nok "Workspace path does not exist"
 exec code-server "$CODE_SERVER_WORKSPACE_FILE"
diff --git a/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-code-server/run b/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-code-server/run
index c8b5f03..febbd28 100644
--- a/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-code-server/run
+++ b/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-code-server/run
@@ -56,15 +56,14 @@ setup_clean_view() {
 }
 
 setup_code_workspace() {
-    # Set a link to where code-server expects the config to be
-    if [ ! -d "$ROOT_CODE_SERVER_CONFIG_PATH" ]; then
-        mkdir -p "$ROOT_CODE_SERVER_CONFIG_PATH"
-        ln -s "$CODE_SERVER_CONFIG" "$ROOT_CODE_SERVER_CONFIG_PATH/config.yaml"
+    # Create the workspace dir
+    if [ ! -d "$CODE_SERVER_WORKSPACE_DIR" ]; then
+        mkdir -p "$CODE_SERVER_WORKSPACE_DIR"
     fi
 
     # Copies the default workspace
     if [ ! -e "$CODE_SERVER_WORKSPACE_FILE" ]; then
-        bashio::log.warning "CODE_SERVER_CONFIG does not exist.."
+        bashio::log.warning "CODE_SERVER_WORKSPACE_FILE does not exist.."
         cp "$DEFAULT_FILES_PATH/SERVER.code-workspace" "$CODE_SERVER_WORKSPACE_FILE"
     fi
 
@@ -76,7 +75,7 @@ setup_config_path() {
     if bashio::config.has_value "vscode_config_path"; then
         DEFAULT_CONFIG_PATH=$(bashio::config 'vscode_config_path')
         if ! bashio::fs.directory_exists "${DEFAULT_CONFIG_PATH}"; then
-            bashio::exit.nok "Configured config path does not exists"
+            bashio::exit.nok "Configured config path does not exist"
         fi
     else
         # otherwise set to local dir
diff --git a/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-custom-bash/run b/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-custom-bash/run
index 612c50e..ffc7070 100644
--- a/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-custom-bash/run
+++ b/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-custom-bash/run
@@ -15,7 +15,6 @@ run() {
         bashio::log.warning "CUSTOM_BASH_SCRIPTS_PATH path did not exist, creating $CUSTOM_BASH_SCRIPTS_PATH"
         mkdir -p "$CUSTOM_BASH_SCRIPTS_PATH" ||
             bashio::exit.nok "Could not create persistent storage folder."
-
     fi
 
     if [[ ! -e "$CUSTOM_BASH_SCRIPTS_PATH"/custom-template.sh ]]; then
@@ -31,7 +30,6 @@ run() {
         done
 
     fi
-
 }
 
 run