From c932b8c89a4005ef1dbca9b28bf2584d4eb47e5e Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 7 Feb 2022 06:22:29 +0000 Subject: [PATCH 1/4] Upgrade to v2022.2.3 --- manifest.json | 2 +- scripts/_common.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index 5fd2687..ba5e12e 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Home automation platform", "fr": "Plateforme domotique" }, - "version": "2021.12.10~ynh1", + "version": "2022.2.3~ynh1", "url": "https://github.com/home-assistant/home-assistant", "upstream": { "license": "Apache-2.0", diff --git a/scripts/_common.sh b/scripts/_common.sh index 10e86ec..5c1cae7 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -5,7 +5,7 @@ #================================================= # Release to install -app_version=2021.12.10 +app_version=2022.2.3 # Package dependencies pkg_dependencies="python3 python3-dev python3-venv python3-pip libffi-dev libssl-dev libjpeg-dev zlib1g-dev autoconf build-essential libopenjp2-7 libtiff5 libturbojpeg0 libmariadb-dev libmariadb-dev-compat" From 8045739005685b26c0332312c3c0d5d100e32bfa Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Mon, 7 Feb 2022 06:22:33 +0000 Subject: [PATCH 2/4] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index efd54ef..e9fa0dd 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Home automation platform -**Shipped version:** 2021.12.10~ynh1 +**Shipped version:** 2022.2.3~ynh1 **Demo:** https://demo.home-assistant.io diff --git a/README_fr.md b/README_fr.md index 9c6e52d..bd311c1 100644 --- a/README_fr.md +++ b/README_fr.md @@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Plateforme domotique -**Version incluse :** 2021.12.10~ynh1 +**Version incluse :** 2022.2.3~ynh1 **Démo :** https://demo.home-assistant.io From d37b7a955b17b64e926745d2f2bf98eccd7bef5d Mon Sep 17 00:00:00 2001 From: ewilly Date: Mon, 7 Feb 2022 21:17:10 +0100 Subject: [PATCH 3/4] Fix restore on fresh install --- scripts/restore | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/scripts/restore b/scripts/restore index b9cd252..7af0f74 100644 --- a/scripts/restore +++ b/scripts/restore @@ -113,6 +113,8 @@ ynh_restore_file --origin_path="$(dirname "$log_file")" ynh_script_progression --message="Restoring the systemd configuration..." ynh_restore_file --origin_path="/etc/systemd/system/$app.service" +# add --verbose to track restart +sed -i 's/ExecStart=.*/& --verbose/g' "/etc/systemd/system/$app.service" systemctl enable $app.service --quiet #================================================= @@ -140,7 +142,14 @@ yunohost service add $app --description="Home Assistant server" --log="$log_file #================================================= ynh_script_progression --message="Starting a systemd service..." -ynh_systemd_action --service_name=$app --action=start +# start systemd service with --verbose +ynh_systemd_action --service_name=$app --action=start --line_match="Home Assistant initialized" --log_path="$log_file" --timeout=3600 + +# remove --verbose from service +ynh_replace_string --match_string=" --verbose" --replace_string="" --target_file="/etc/systemd/system/$app.service" +ynh_store_file_checksum --file="/etc/systemd/system/$app.service" +systemctl daemon-reload +ynh_systemd_action --service_name=$app --action=restart #================================================= # GENERIC FINALIZATION From 622b64078ae6834f2c7fb27ab11407bdf0ff10c7 Mon Sep 17 00:00:00 2001 From: ewilly Date: Mon, 7 Feb 2022 22:37:55 +0100 Subject: [PATCH 4/4] Fix dpkg --compare-versions --- scripts/_common.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 10e86ec..7ec34da 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -65,7 +65,7 @@ myynh_install_python () { fi # Compare version - if [ $(dpkg --compare-versions $py_apt_version ge $python) ] + if $(dpkg --compare-versions $py_apt_version ge $python) then # APT >= Required ynh_print_info --message="Using provided python3..." @@ -74,7 +74,7 @@ myynh_install_python () { else # Either python already built or to build - if [ $(dpkg --compare-versions $py_built_version ge $python) ] + if $(dpkg --compare-versions $py_built_version ge $python) then # Built >= Required ynh_print_info --message="Using already used python3 built version..."