From 74f6dd5d546d01604d13437d91cb444ab80c126d Mon Sep 17 00:00:00 2001
From: jjm2473 <1129525450@qq.com>
Date: Sun, 12 Mar 2023 19:13:38 +0800
Subject: [PATCH] luci-app-homeassistant: update image tag

---
 applications/luci-app-homeassistant/Makefile                | 2 +-
 .../luasrc/model/cbi/homeassistant/config.lua               | 4 +++-
 .../luci-app-homeassistant/root/etc/config/homeassistant    | 2 +-
 .../root/usr/libexec/istorec/homeassistant.sh               | 6 +++++-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/applications/luci-app-homeassistant/Makefile b/applications/luci-app-homeassistant/Makefile
index 204b362..0175008 100644
--- a/applications/luci-app-homeassistant/Makefile
+++ b/applications/luci-app-homeassistant/Makefile
@@ -2,7 +2,7 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_VERSION:=1.1.1-20230108
+PKG_VERSION:=1.1.2-20230312
 PKG_RELEASE:=
 
 LUCI_TITLE:=LuCI support for homeassistant
diff --git a/applications/luci-app-homeassistant/luasrc/model/cbi/homeassistant/config.lua b/applications/luci-app-homeassistant/luasrc/model/cbi/homeassistant/config.lua
index da62cc5..bae81d0 100644
--- a/applications/luci-app-homeassistant/luasrc/model/cbi/homeassistant/config.lua
+++ b/applications/luci-app-homeassistant/luasrc/model/cbi/homeassistant/config.lua
@@ -22,8 +22,10 @@ o = s:option(Value, "image_name", translate("Image").."<b>*</b>")
 o.rmempty = false
 o.datatype = "string"
 o:value("homeassistant/home-assistant:latest", "homeassistant/home-assistant:latest")
+o:value("homeassistant/home-assistant:2023.3.3", "homeassistant/home-assistant:2023.3.3")
+o:value("homeassistant/home-assistant:dev", "homeassistant/home-assistant:dev")
 o:value("ghcr.io/home-assistant/home-assistant:stable", "ghcr.io/home-assistant/home-assistant:stable")
-o:value("ghcr.io/home-assistant/home-assistant:2022.11.4", "ghcr.io/home-assistant/home-assistant:2022.11.4")
+o:value("ghcr.io/home-assistant/home-assistant:2023.3.3", "ghcr.io/home-assistant/home-assistant:2023.3.3")
 o.default = "homeassistant/home-assistant:latest"
 
 local blocks = homeassistant_model.blocks()
diff --git a/applications/luci-app-homeassistant/root/etc/config/homeassistant b/applications/luci-app-homeassistant/root/etc/config/homeassistant
index e1815d2..82ab624 100644
--- a/applications/luci-app-homeassistant/root/etc/config/homeassistant
+++ b/applications/luci-app-homeassistant/root/etc/config/homeassistant
@@ -1,4 +1,4 @@
 config homeassistant
 	option 'config_path' ''
 	option 'image_name' 'homeassistant/home-assistant:latest'
-  option 'time_zone' ''
+	option 'time_zone' ''
diff --git a/applications/luci-app-homeassistant/root/usr/libexec/istorec/homeassistant.sh b/applications/luci-app-homeassistant/root/usr/libexec/istorec/homeassistant.sh
index aaa9362..d23c1ce 100755
--- a/applications/luci-app-homeassistant/root/usr/libexec/istorec/homeassistant.sh
+++ b/applications/luci-app-homeassistant/root/usr/libexec/istorec/homeassistant.sh
@@ -35,15 +35,19 @@ do_install() {
 
   RET=$?
   if [ "$RET" = "0" ]; then
+    echo "Wait 10 seconds for homeassistant boot..."
+    sleep 10
     do_hacs_install
   fi
 }
 
 do_hacs_install() {
-  echo "wget -O - https://get.hacs.xyz | bash -" | docker exec -i homeassistant bash -
+  echo "Install HACS"
+  echo "rm -f custom_components/hacs.zip config/custom_components/hacs.zip ; wget -O - https://get.hacs.xyz | bash -" | docker exec -i homeassistant bash -
   sleep 3
   echo "restart homeassistant"
   docker restart homeassistant
+  return 0
 }
 
 usage() {