From d7b36831307386fa34c0985c7c9817dcd8820fab Mon Sep 17 00:00:00 2001
From: Stavros Kois <47820033+stavros-k@users.noreply.github.com>
Date: Sun, 21 Jan 2024 18:32:43 +0200
Subject: [PATCH] fix(home-assistant): fix script (#17463)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

**Description**
<!--
Please include a summary of the change and which issue is fixed. Please
also include relevant motivation and context. List any dependencies that
are required for this change.
-->
⚒️ Fixes  # <!--(issue)-->

**⚙️ Type of change**

- [ ] ⚙️ Feature/App addition
- [ ] 🪛 Bugfix
- [ ] ⚠️ Breaking change (fix or feature that would cause existing
functionality to not work as expected)
- [ ] 🔃 Refactor of current code

**🧪 How Has This Been Tested?**
<!--
Please describe the tests that you ran to verify your changes. Provide
instructions so we can reproduce. Please also list any relevant details
for your test configuration
-->

**📃 Notes:**
<!-- Please enter any other relevant information here -->

**✔️ Checklist:**

- [ ] ⚖️ My code follows the style guidelines of this project
- [ ] 👀 I have performed a self-review of my own code
- [ ] #️⃣ I have commented my code, particularly in hard-to-understand
areas
- [ ] 📄 I have made corresponding changes to the documentation
- [ ] ⚠️ My changes generate no new warnings
- [ ] 🧪 I have added tests to this description that prove my fix is
effective or that my feature works
- [ ] ⬆️ I increased versions for any altered app according to semantic
versioning

**➕ App addition**

If this PR is an app addition please make sure you have done the
following.

- [ ] 🖼️ I have added an icon in the Chart's root directory called
`icon.png`

---

_Please don't blindly check all the boxes. Read them and only check
those that apply.
Those checkboxes are there for the reviewer to see what is this all
about and
the status of this PR with a quick glance._

---------

Signed-off-by: Stavros Kois <47820033+stavros-k@users.noreply.github.com>
---
 charts/stable/home-assistant/Chart.yaml  |  2 +-
 charts/stable/home-assistant/values.yaml | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/charts/stable/home-assistant/Chart.yaml b/charts/stable/home-assistant/Chart.yaml
index 00bc9f841d4..1b796cb1f5c 100644
--- a/charts/stable/home-assistant/Chart.yaml
+++ b/charts/stable/home-assistant/Chart.yaml
@@ -36,4 +36,4 @@ sources:
   - https://github.com/truecharts/charts/tree/master/charts/stable/home-assistant
   - https://hub.docker.com/r/homeassistant/home-assistant
 type: application
-version: 23.0.8
+version: 23.0.9
diff --git a/charts/stable/home-assistant/values.yaml b/charts/stable/home-assistant/values.yaml
index 74fd98afaab..613d030f59b 100644
--- a/charts/stable/home-assistant/values.yaml
+++ b/charts/stable/home-assistant/values.yaml
@@ -15,7 +15,7 @@ workload:
         init:
           type: init
           enabled: true
-          imageSelector: image
+          imageSelector: yqImage
           command: /config/init/init.sh
 # # Enable devices to be discoverable
 # hostNetwork: true
@@ -51,8 +51,8 @@ configmap:
     data:
       init.sh: |-
         #!/bin/sh
-        {{ $haDBURL := (printf "%s?client_encoding=utf8" (.Values.cnpg.main.creds.std | trimAll "\"")) | quote }}
-        config_file="/config/configuration.yaml"
+        {{- $haDBURL := (printf "%s?client_encoding=utf8" ($.Values.cnpg.main.creds.std | trimAll "\"")) }}
+        config="/config/configuration.yaml"
         default="/config/init"
         if [ ! -f "$config" ]; then
           echo "File [$config] does NOT exist. Creating..."
@@ -75,7 +75,7 @@ configmap:
 
         echo "Creating include files..."
         for include_file in groups.yaml automations.yaml scripts.yaml scenes.yaml; do
-          if ! -f "/config/$include_file"; then
+          if [ ! -f "/config/$include_file" ]; then
             echo "File [$include_file] missing. Creating"
             touch "/config/$include_file"
           fi
@@ -83,7 +83,7 @@ configmap:
 
         cd "/config" || echo "Could not change path to /config"
         echo "Creating custom_components directory..."
-        mkdir "/config/custom_components" || echo "custom_components directory already exists"
+        mkdir -p "/config/custom_components" || echo "custom_components directory already exists"
 
         echo "Changing to the custom_components directory..."
         cd "/config/custom_components" || echo "Could not change path to /config/custom_components"
@@ -97,7 +97,7 @@ configmap:
         fi
 
         echo "Creating HACS directory..."
-        mkdir "/config/custom_components/hacs"
+        mkdir -p "/config/custom_components/hacs"
 
         echo "Unpacking HACS..."
         unzip "/config/custom_components/hacs.zip" -d "/config/custom_components/hacs" >/dev/null 2>&1