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

---
 .../etc/s6-overlay/s6-rc.d/code-server/run       |  5 +----
 .../etc/s6-overlay/s6-rc.d/init-code-server/run  | 16 +---------------
 .../etc/s6-overlay/s6-rc.d/init-custom-bash/run  |  2 +-
 vscode/rootfs/etc/s6-overlay/s6-rc.d/paths.sh    | 16 ++++++++++++++++
 4 files changed, 19 insertions(+), 20 deletions(-)
 create mode 100644 vscode/rootfs/etc/s6-overlay/s6-rc.d/paths.sh

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 d1d1410..1b4ea17 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,14 +5,11 @@
 # Runs the code-server
 # ==============================================================================
 bashio::log.info 'Starting code-server...'
-
+source "../paths.sh"
 # Export env variables for the Home Assistant extension
 export HASS_SERVER="http://supervisor/core"
 export HASS_TOKEN="${SUPERVISOR_TOKEN:-}"
 
-readonly DEFAULT_CONFIG_PATH="/data/vscode"
-readonly CODE_SERVER_WORKSPACE_DIR="$DEFAULT_CONFIG_PATH/workspace"
-readonly CODE_SERVER_WORKSPACE_FILE="$CODE_SERVER_WORKSPACE_DIR/SERVER.code-workspace"
 
 # Run the code server
 cd "$CODE_SERVER_WORKSPACE_DIR" || bashio::exit.nok "Workspace path does not exist"
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 910710b..81b0ccd 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,20 +22,8 @@ readonly -a PREVIOUS_DEFAULT_CONFIG_HASHES=(
     dbe905f0935b2fea8bb5ba379bff78db9d056ea6d0965c68aa9b07938a52cbbf117186452b2b6c766aa4cf93cc3494ad91b763e8500e515e41d8cde31a3821ae
     2212babaa9dc46d38ba239052c9c05151abe517cc8b493d0d351a96bf70c1efa4f7479f6ed0b75811429ba649906eb5657d73b0732b460e718a5c66603dcdbda
 )
-readonly DEFAULT_FILES_PATH="/var/lib/code-server/defaults"
-readonly DEFAULT_CONFIG_PATH="/data/vscode"
-readonly ROOT_CODE_SERVER_CONFIG_PATH="/root/.config/code-server/" # needed for code-server to cleanly
-readonly CODE_SERVER_EXTENSIONS_INSTALL_PATH="$DEFAULT_CONFIG_PATH/extensions"
-readonly CODE_SERVER_EXTENSIONS_LIST="$DEFAULT_CONFIG_PATH/vscode.extensions"
-readonly CODE_SERVER_WORKSPACE_DIR="/data/workspace"
-readonly CODE_SERVER_WORKSPACE_FILE="$CODE_SERVER_WORKSPACE_DIR/SERVER.code-workspace"
-readonly CODE_SERVER_VSCODE_DIR="$CODE_SERVER_WORKSPACE_DIR/.vscode"
-
-readonly CODE_SERVER_VSCODE_TASKS="$CODE_SERVER_VSCODE_DIR/tasks.json"
-readonly -a DIRECTORIES=(addons addon_configs backup config media share ssl)
-
-CODE_SERVER_CONFIG="$DEFAULT_CONFIG_PATH/config.yaml"
 
+source "../paths.sh"
 run() {
     setup_code_workspace
     setup_clean_view
@@ -80,8 +68,6 @@ setup_code_workspace() {
         bashio::log.warning "CODE_SERVER_WORKSPACE_FILE does not exist. Creating..."
         cp "$DEFAULT_FILES_PATH/vscode/tasks.json" "$CODE_SERVER_VSCODE_TASKS"
     fi
-
-    export CODE_SERVER_WORKSPACE_FILE
 }
 
 setup_config_path() {
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 6949e7f..be77e48 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
@@ -5,7 +5,7 @@
 # Sets up code-server.
 # ==============================================================================
 bashio::log.info "Initalizing code-server configs"
-
+source "../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"
diff --git a/vscode/rootfs/etc/s6-overlay/s6-rc.d/paths.sh b/vscode/rootfs/etc/s6-overlay/s6-rc.d/paths.sh
new file mode 100644
index 0000000..23b0ba5
--- /dev/null
+++ b/vscode/rootfs/etc/s6-overlay/s6-rc.d/paths.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+# this file is to prevent spagetti paths
+# shellcheck disable=SC2034
+
+DEFAULT_CONFIG_PATH="/data/vscode"
+CODE_SERVER_CONFIG="$DEFAULT_CONFIG_PATH/config.yaml"
+
+readonly DEFAULT_FILES_PATH="/var/lib/code-server/defaults"
+readonly ROOT_CODE_SERVER_CONFIG_PATH="/root/.config/code-server/" # needed for code-server to cleanly
+readonly CODE_SERVER_EXTENSIONS_INSTALL_PATH="$DEFAULT_CONFIG_PATH/extensions"
+readonly CODE_SERVER_EXTENSIONS_LIST="$DEFAULT_CONFIG_PATH/vscode.extensions"
+readonly CODE_SERVER_WORKSPACE_DIR="/data/workspace"
+readonly CODE_SERVER_WORKSPACE_FILE="$CODE_SERVER_WORKSPACE_DIR/SERVER.code-workspace"
+readonly CODE_SERVER_VSCODE_DIR="$CODE_SERVER_WORKSPACE_DIR/.vscode"
+readonly CODE_SERVER_VSCODE_TASKS="$CODE_SERVER_VSCODE_DIR/tasks.json"
+readonly -a DIRECTORIES=(addons addon_configs backup config media share ssl)