From 269cdae8699ea949f0bea5a0788143c9d6abccea Mon Sep 17 00:00:00 2001
From: Franck Nijhof <git@frenck.dev>
Date: Fri, 27 Sep 2024 23:52:34 +0200
Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A7=20Update=20add-on=20paths,=20map?=
 =?UTF-8?q?=20directly=20to=20/config=20(#864)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vscode/config.yaml                            | 22 +++++++++++++------
 .../etc/s6-overlay/s6-rc.d/code-server/finish |  1 -
 .../etc/s6-overlay/s6-rc.d/init-user/run      |  4 +---
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/vscode/config.yaml b/vscode/config.yaml
index 85bf0c8..0921ef8 100644
--- a/vscode/config.yaml
+++ b/vscode/config.yaml
@@ -19,13 +19,21 @@ hassio_api: true
 hassio_role: manager
 homeassistant_api: true
 map:
-  - addons:rw
-  - all_addon_configs:rw
-  - backup:rw
-  - homeassistant_config:rw
-  - media:rw
-  - share:rw
-  - ssl:rw
+  - type: addons
+    read_only: false
+  - type: all_addon_configs
+    read_only: false
+  - type: backup
+    read_only: false
+  - type: homeassistant_config
+    read_only: false
+    path: /config
+  - type: media
+    read_only: false
+  - type: share
+    read_only: false
+  - type: ssl
+    read_only: false
 services:
   - mysql:want
   - mqtt:want
diff --git a/vscode/rootfs/etc/s6-overlay/s6-rc.d/code-server/finish b/vscode/rootfs/etc/s6-overlay/s6-rc.d/code-server/finish
index fc23311..7dc933d 100755
--- a/vscode/rootfs/etc/s6-overlay/s6-rc.d/code-server/finish
+++ b/vscode/rootfs/etc/s6-overlay/s6-rc.d/code-server/finish
@@ -4,7 +4,6 @@
 # Home Assistant Community Add-on: Studio Code Server
 # Take down the S6 supervision tree when the code server fails
 # ==============================================================================
-declare exit_code
 readonly exit_code_container=$(</run/s6-linux-init-container-results/exitcode)
 readonly exit_code_service="${1}"
 readonly exit_code_signal="${2}"
diff --git a/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-user/run b/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-user/run
index ca0b5e9..e95fdb3 100755
--- a/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-user/run
+++ b/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-user/run
@@ -17,9 +17,7 @@ for dir in "${DIRECTORIES[@]}"; do
 done
 
 # Some links to old locations, to not mess with the user's muscle memory
-ln -s "/homeassistant" "/config" \
-    || bashio::log.warning "Failed linking common directory: /config"
-ln -s "/homeassistant" "${HOME}/config" \
+ln -s "/config" "${HOME}/config" \
     || bashio::log.warning "Failed linking common directory: ${HOME}/config"
 
 # Store SSH settings in add-on data folder