Skip to content

Commit

Permalink
Merge pull request #361 from YunoHost-Apps/master-promotion
Browse files Browse the repository at this point in the history
Upgrade master from testing
  • Loading branch information
ericgaspar committed Aug 8, 2024
2 parents 6ba448d + c2bb5c8 commit 0fdd2bc
Show file tree
Hide file tree
Showing 9 changed files with 30 additions and 21 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:** <https://demo.home-assistant.io>

Expand Down
2 changes: 1 addition & 1 deletion README_es.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:** <https://demo.home-assistant.io>

Expand Down
2 changes: 1 addition & 1 deletion README_eu.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:** <https://demo.home-assistant.io>

Expand Down
2 changes: 1 addition & 1 deletion README_fr.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 :** <https://demo.home-assistant.io>

Expand Down
2 changes: 1 addition & 1 deletion README_gl.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:** <https://demo.home-assistant.io>

Expand Down
2 changes: 1 addition & 1 deletion README_id.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:** <https://demo.home-assistant.io>

Expand Down
2 changes: 1 addition & 1 deletion README_zh_Hans.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

**演示:** <https://demo.home-assistant.io>

Expand Down
6 changes: 3 additions & 3 deletions manifest.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"]

Expand Down Expand Up @@ -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"

Expand Down
31 changes: 20 additions & 11 deletions scripts/_common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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=""
Expand Down

0 comments on commit 0fdd2bc

Please sign in to comment.