From b30873fae2148f2fa112a710b0b61bcaadc23a35 Mon Sep 17 00:00:00 2001
From: Richard Sperry <Richard@SperryFamily.net>
Date: Wed, 16 Apr 2025 22:43:24 -0700
Subject: [PATCH] devenv

---
 vscode/rootfs/etc/s6-overlay/s6-rc.d/code-server/run      | 8 ++++----
 vscode/rootfs/etc/s6-overlay/s6-rc.d/init-code-server/run | 5 +++--
 vscode/rootfs/etc/s6-overlay/s6-rc.d/init-custom-bash/run | 6 +++---
 3 files changed, 10 insertions(+), 9 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 9a7fe04..6c8365a 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
@@ -5,11 +5,11 @@
 # Runs the code-server
 # ==============================================================================
 bashio::log.info 'Starting code-server...'
-parent_dir=$(dirname "$(readlink -f "$0")"
-echo "$parent_dir"
-)
+
+caller_dir=$(dirname "$(readlink -f "$0")")
 # shellcheck source=../paths.sh
-source "$parent_dir/paths.sh"
+source "../$caller_dir/paths.sh"
+
 # Export env variables for the Home Assistant extension
 export HASS_SERVER="http://supervisor/core"
 export HASS_TOKEN="${SUPERVISOR_TOKEN:-}"
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 b4234e1..513fd71 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
@@ -22,9 +22,10 @@ readonly -a PREVIOUS_DEFAULT_CONFIG_HASHES=(
     dbe905f0935b2fea8bb5ba379bff78db9d056ea6d0965c68aa9b07938a52cbbf117186452b2b6c766aa4cf93cc3494ad91b763e8500e515e41d8cde31a3821ae
     2212babaa9dc46d38ba239052c9c05151abe517cc8b493d0d351a96bf70c1efa4f7479f6ed0b75811429ba649906eb5657d73b0732b460e718a5c66603dcdbda
 )
-parent_dir=$(dirname "$(readlink -f "$0")")
+caller_dir=$(dirname "$(readlink -f "$0")")
 # shellcheck source=../paths.sh
-source "$parent_dir/paths.sh"
+source "../$caller_dir/paths.sh"
+
 CODE_SERVER_CONFIG="$DEFAULT_CONFIG_PATH/config.yaml"
 
 run() {
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 9587626..8ddac7c 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
@@ -6,10 +6,10 @@
 # ==============================================================================
 bashio::log.info "Initalizing code-server configs"
 
-parent_dir=$(dirname "$(readlink -f "$0")")
-echo "$parent_dir"
+caller_dir=$(dirname "$(readlink -f "$0")")
 # shellcheck source=../paths.sh
-source "$parent_dir/paths.sh"
+source "../$caller_dir/paths.sh"
+
 # List of previous config hashes, to allow upgrade "default" configs.
 readonly CUSTOM_BASH_SCRIPTS_PATH="/data/custom"
 readonly DEFAULT_FILES_PATH="/var/lib/code-server/defaults/core"