From eeaf801b7ee0631bc029458bf06fff2f37622718 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Thu, 1 Aug 2024 09:07:00 +0200 Subject: [PATCH 1/3] Fix #360 --- scripts/_common.sh | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index f67ff24..3abbc2e 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -160,16 +160,25 @@ myynh_install_homeassistant () { myynh_upgrade_venv_directory () { # Remove old python links before recreating them - find "$install_dir/bin/" -type l -name 'python*' \ - -exec bash -c 'rm --force "$1"' _ {} \; + if [ -e "$install_dir/bin/" ] + then + find "$install_dir/bin/" -type l -name 'python*' \ + -exec bash -c 'rm --force "$1"' _ {} \; + fi # Remove old python directories before recreating them - find "$install_dir/lib/" -mindepth 1 -maxdepth 1 -type d -name "python*" \ - -not -path "*/python${py_required_version%.*}" \ - -exec bash -c 'rm --force --recursive "$1"' _ {} \; - find "$install_dir/include/site/" -mindepth 1 -maxdepth 1 -type d -name "python*" \ - -not -path "*/python${py_required_version%.*}" \ - -exec bash -c 'rm --force --recursive "$1"' _ {} \; + if [ -e "$install_dir/lib/" ] + then + find "$install_dir/lib/" -mindepth 1 -maxdepth 1 -type d -name "python*" \ + -not -path "*/python${py_required_version%.*}" \ + -exec bash -c 'rm --force --recursive "$1"' _ {} \; + fi + if [ -e "$install_dir/include/site/" ] + then + find "$install_dir/include/site/" -mindepth 1 -maxdepth 1 -type d -name "python*" \ + -not -path "*/python${py_required_version%.*}" \ + -exec bash -c 'rm --force --recursive "$1"' _ {} \; + fi # Upgrade the virtual environment directory ynh_exec_as $app $py_app_version -m venv --upgrade "$install_dir" @@ -184,11 +193,11 @@ myynh_set_permissions () { chown -R $app: "$data_dir" chmod 750 "$data_dir" chmod -R o-rwx "$data_dir" - [ ! -e "$data_dir/bin/" ] || chmod -R +x "$data_dir/bin/" + [ -e "$data_dir/bin/" ] && chmod -R +x "$data_dir/bin/" - [ ! -e "$(dirname "$log_file")" ] || chown -R $app: "$(dirname "$log_file")" + [ -e "$(dirname "$log_file")" ] && chown -R $app: "$(dirname "$log_file")" - [ ! -e "/etc/sudoers.d/$app" ] || chown -R root: "/etc/sudoers.d/$app" + [ -e "/etc/sudoers.d/$app" ] && chown -R root: "/etc/sudoers.d/$app" # Upgade user groups user_groups="" From bed4f3bd10c237f1429ab7f029b9cd8b2c327bc3 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 8 Aug 2024 03:35:33 +0200 Subject: [PATCH 2/3] Upgrade sources - `main` v2024.8.0: https://github.com/home-assistant/core/releases/tag/2024.8.0 --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index c9a0f47..01b254c 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Home Assistant" description.en = "Home automation platform" description.fr = "Plateforme domotique" -version = "2024.7.4~ynh1" +version = "2024.8.0~ynh1" maintainers = ["ewilly"] @@ -80,8 +80,8 @@ ram.runtime = "2G" [resources.sources] [resources.sources.main] - url = "https://github.com/home-assistant/core/archive/refs/tags/2024.7.4.tar.gz" - sha256 = "16d00a28fa476153fd0bc699c17b88d3d9b329093b9c91475a72b300fe5342a0" + url = "https://github.com/home-assistant/core/archive/refs/tags/2024.8.0.tar.gz" + sha256 = "988dca5a404f7aa8609c5b4896eb607c95919cfc4cf11ac179b51b3e3fde7ae5" autoupdate.strategy = "latest_github_release" From 51cf9e96a8a7d9903718d3e75eeff876c728fca8 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 8 Aug 2024 01:35:35 +0000 Subject: [PATCH 3/3] Auto-update READMEs --- README.md | 2 +- README_es.md | 2 +- README_eu.md | 2 +- README_fr.md | 2 +- README_gl.md | 2 +- README_id.md | 2 +- README_zh_Hans.md | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 7401030..9d684bb 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ Home Assistant is an open source home automation that puts local control and pri - Home Energy Management." -**Shipped version:** 2024.7.4~ynh1 +**Shipped version:** 2024.8.0~ynh1 **Demo:** diff --git a/README_es.md b/README_es.md index cc38c20..44cf1a6 100644 --- a/README_es.md +++ b/README_es.md @@ -28,7 +28,7 @@ Home Assistant is an open source home automation that puts local control and pri - Home Energy Management." -**Versión actual:** 2024.7.4~ynh1 +**Versión actual:** 2024.8.0~ynh1 **Demo:** diff --git a/README_eu.md b/README_eu.md index 02fb503..eec60e8 100644 --- a/README_eu.md +++ b/README_eu.md @@ -28,7 +28,7 @@ Home Assistant is an open source home automation that puts local control and pri - Home Energy Management." -**Paketatutako bertsioa:** 2024.7.4~ynh1 +**Paketatutako bertsioa:** 2024.8.0~ynh1 **Demoa:** diff --git a/README_fr.md b/README_fr.md index b486a94..0cb5163 100644 --- a/README_fr.md +++ b/README_fr.md @@ -27,7 +27,7 @@ Home Assistant zst une application domotique open source qui donne la priorité - Applications mobiles compagnons ; - Gestion de l'énergie domestique. -**Version incluse :** 2024.7.4~ynh1 +**Version incluse :** 2024.8.0~ynh1 **Démo :** diff --git a/README_gl.md b/README_gl.md index 8ea6d59..4a3d56b 100644 --- a/README_gl.md +++ b/README_gl.md @@ -28,7 +28,7 @@ Home Assistant is an open source home automation that puts local control and pri - Home Energy Management." -**Versión proporcionada:** 2024.7.4~ynh1 +**Versión proporcionada:** 2024.8.0~ynh1 **Demo:** diff --git a/README_id.md b/README_id.md index 3921444..3e8579f 100644 --- a/README_id.md +++ b/README_id.md @@ -28,7 +28,7 @@ Home Assistant is an open source home automation that puts local control and pri - Home Energy Management." -**Versi terkirim:** 2024.7.4~ynh1 +**Versi terkirim:** 2024.8.0~ynh1 **Demo:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md index ef0ebfb..444c240 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -28,7 +28,7 @@ Home Assistant is an open source home automation that puts local control and pri - Home Energy Management." -**分发版本:** 2024.7.4~ynh1 +**分发版本:** 2024.8.0~ynh1 **演示:**