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

---
 vscode/config.yaml                                       | 1 +
 .../rootfs/etc/s6-overlay/s6-rc.d/init-code-server/run   | 9 ++++-----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/vscode/config.yaml b/vscode/config.yaml
index 87ab00c..40b1589 100644
--- a/vscode/config.yaml
+++ b/vscode/config.yaml
@@ -22,6 +22,7 @@ homeassistant_api: true
 map:
   - type: data
     read_only: false
+    path: /code-server-config
 services:
   - mysql:want
   - mqtt:want
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 999a1fe..d54d6cb 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
@@ -23,7 +23,7 @@ readonly -a PREVIOUS_DEFAULT_CONFIG_HASHES=(
     2212babaa9dc46d38ba239052c9c05151abe517cc8b493d0d351a96bf70c1efa4f7479f6ed0b75811429ba649906eb5657d73b0732b460e718a5c66603dcdbda
 )
 readonly DEFAULT_FILES_PATH="/var/lib/code-server/defaults"
-readonly DEFAULT_CONFIG_PATH="/data/vscode"
+readonly DEFAULT_CONFIG_PATH="/code-server-config/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"
@@ -46,7 +46,7 @@ if bashio::config.has_value "vscode_config_path"; then
 else
     # otherwise set to local dir
     if ! bashio::fs.directory_exists "$DEFAULT_CONFIG_PATH"; then
-        bashio::log.info "Config path did not exist, creating $CODE_SERVER_CONFIG"
+        bashio::log.warning "Config path did not exist, creating $CODE_SERVER_CONFIG"
         mkdir -p "$DEFAULT_CONFIG_PATH" ||
             bashio::exit.nok "Could not create persistent storage folder."
     fi
@@ -95,7 +95,6 @@ else
     # Upgrade if settings.json is still default from previous version.
     current=$(sha512sum "$user_path"/settings.json | cut -d " " -f 1)
     if [[ " ${PREVIOUS_DEFAULT_CONFIG_HASHES[*]} " == *" ${current} "* ]]; then
-
         cp "$DEFAULT_FILES_PATH/settings.json" "$user_path/settings.json"
     fi
 fi
@@ -108,12 +107,12 @@ fi
 
 # Ensure extensions path
 if [ ! -e "$CODE_SERVER_EXTENSIONS_LIST" ]; then
-    bashio::log.error "CODE_SERVER_EXTENSIONS_LIST does not exist.."
+    bashio::log.warning "CODE_SERVER_EXTENSIONS_LIST does not exist.."
     cp "$DEFAULT_FILES_PATH/vscode.extensions" "$CODE_SERVER_EXTENSIONS_LIST"
 fi
 
 if [ ! -d "$CODE_SERVER_EXTENSIONS_INSTALL_PATH" ]; then
-    bashio::log.error "CODE_SERVER_EXTENSIONS_INSTALL_PATH does not exist.."
+    bashio::log.warning "CODE_SERVER_EXTENSIONS_INSTALL_PATH does not exist.."
     mkdir -p "$CODE_SERVER_EXTENSIONS_INSTALL_PATH" ||
         bashio::exit.nok "Could not create persistent extensions folder."