From 4b8525b29df289dfe63fba269e693e987781f17c Mon Sep 17 00:00:00 2001 From: Krakinou Date: Sat, 20 Jan 2024 15:52:17 +0100 Subject: [PATCH] Move to 2024.2 --- manifest.toml | 16 ++++++++-------- scripts/backup | 2 +- scripts/install | 4 ---- scripts/remove | 2 +- scripts/restore | 6 +----- scripts/upgrade | 8 ++------ 6 files changed, 13 insertions(+), 25 deletions(-) diff --git a/manifest.toml b/manifest.toml index 6c58fb2..26a92a0 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Domoticz" description.en = "Home automation system that lets you monitor and configure miscellaneous devices" description.fr = "Logiciel de domotique qui vous permet de configurer un grand nombre d'appareils" -version = "2023.2~ynh1" +version = "2024.2~ynh1" maintainers = ["Krakinou"] @@ -42,12 +42,12 @@ ram.runtime = "50M" [resources] [resources.sources.main] - arm64.url = "https://github.com/Krakinou/domoticz_build_on_arch/releases/download/2023.2/domoticz_linux_2023.2_aarch64.tgz" - arm64.sha256 = "b05919713e13873092addedb603d8eed29bd7761e4a73cbada9b887b212723f3" - armhf.url = "https://github.com/Krakinou/domoticz_build_on_arch/releases/download/2023.2/domoticz_linux_2023.2_armhf.tgz" - armhf.sha256 = "73e5c06a9a059195ff2f9c6a82baf589003eb14bcb9642d1979a0e722d0aafb6" - amd64.url = "https://github.com/Krakinou/domoticz_build_on_arch/releases/download/2023.2/domoticz_linux_2023.2_x86_64.tgz" - amd64.sha256 = "2f8f83facbe019569080f6c60d19ab9c13bf64e72b771d269ee019d54e20e1bc" + arm64.url = "https://github.com/domoticz/domoticz/releases/download/2024.2/domoticz_linux_2024.2_aarch64.tgz" + arm64.sha256 = "d0ee6660c1c05c2949bfbe669de0029795f5974a5f00b6818c0aefba944b3fd6" + armhf.url = "https://github.com/domoticz/domoticz/releases/download/2024.2/domoticz_linux_2024.2_armv7l.tgz" + armhf.sha256 = "23eb3f4d2c818761773a45282b054f2707808005643ceba10a386cb1cf93db0a" + amd64.url = "https://github.com/domoticz/domoticz/releases/download/2024.2/domoticz_linux_2024.2_x86_64.tgz" + amd64.sha256 = "0f973af6dcadef17d75ac7372dfc2f0a87bd0fabca8db04348fe34bd1d0180e2" format="tar.gz" in_subdir=false extract=true @@ -56,7 +56,7 @@ ram.runtime = "50M" autoupdate.asset.arm64 = ".*_aarch64.tgz" autoupdate.asset.amd64 = ".*_x86_64.tgz" - autoupdate.asset.armhf = ".*_armhf.tgz" + autoupdate.asset.armhf = ".*_armv7l.tgz" [resources.system_user] diff --git a/scripts/backup b/scripts/backup index bc94d73..a5bc6a7 100755 --- a/scripts/backup +++ b/scripts/backup @@ -10,7 +10,7 @@ source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers -#from 2023.1~ynh1 +#from 2024.2~ynh1 #End of support for mosquitto. However, we still keep trace of if it was installed in order to be able to back it up and remove it correctly mosquitto=$(ynh_app_setting_get --app=$app --key=mosquitto) if [[ -z "${mosquitto+x}" ]]; then diff --git a/scripts/install b/scripts/install index 677f041..3791bfd 100755 --- a/scripts/install +++ b/scripts/install @@ -17,10 +17,6 @@ ynh_script_progression --message="Storing installation settings..." #Will be used in restore script to check that we're restoring on the same OS/Board type OS=`lowercase \`uname -s\`` mach=`uname -m` -if [ "${mach}" = "armv6l" ] -then - mach="armv7l" -fi ynh_app_setting_set --app="$app" --key=OS --value="$OS" ynh_app_setting_set --app="$app" --key=mach --value="$mach" diff --git a/scripts/remove b/scripts/remove index d052368..11a7baa 100755 --- a/scripts/remove +++ b/scripts/remove @@ -9,7 +9,7 @@ source _common.sh source /usr/share/yunohost/helpers -#from 2023.1~ynh1 +#from 2024.2~ynh1 #End of support for mosquitto. However, we still keep trace of if it was installed in order to be able to back it up and remove it correctly mosquitto=$(ynh_app_setting_get --app=$app --key=mosquitto) if [[ -z "${mosquitto+x}" ]]; then diff --git a/scripts/restore b/scripts/restore index 2284fc6..c308c9c 100755 --- a/scripts/restore +++ b/scripts/restore @@ -12,12 +12,8 @@ source /usr/share/yunohost/helpers current_os=`lowercase \`uname -s\`` current_mach=`uname -m` -if [ ${current_mach} = "armv6l" ] -then - current_mach="armv7l" -fi -#from 2023.1~ynh1 +#from 2024.2~ynh1 #End of support for mosquitto. However, we still keep trace of if it was installed in order to be able to back it up and remove it correctly mosquitto=$(ynh_app_setting_get --app=$app --key=mosquitto) if [[ -z "${mosquitto+x}" ]]; then diff --git a/scripts/upgrade b/scripts/upgrade index 208f037..554bbde 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -9,7 +9,7 @@ source _common.sh source /usr/share/yunohost/helpers -#from 2023.1~ynh1 +#from 2024.2~ynh1 #End of support for mosquitto. However, we still keep trace of if it was installed in order to be able to back it up and remove it correctly mosquitto=$(ynh_app_setting_get --app=$app --key=mosquitto) if [[ -z "${mosquitto+x}" ]]; then @@ -48,14 +48,10 @@ if [ -z "${OS:+x}" ]; then fi if [ -z "${mach:+x}" ]; then mach=`uname -m` - if [ "${mach}" = "armv6l" ] - then - mach="armv7l" - fi ynh_app_setting_set --app="$app" --key=mach --value="$mach" fi -#sudoer file for restarting is not required anymore (from 2023.1~ynh1) as upgrade is managed by the Yunohost Package +#sudoer file for restarting is not required anymore (from 2024.2~ynh1) as upgrade is managed by the Yunohost Package if [ -f /etc/sudoers.d/domoticz ]; then rm /etc/sudoers.d/domoticz fi