From f5d72ba7055d94242ca047db7ef7a8458e568f14 Mon Sep 17 00:00:00 2001 From: Krakinou Date: Thu, 25 Jan 2024 22:19:41 +0100 Subject: [PATCH 1/6] 2024.3 --- manifest.toml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/manifest.toml b/manifest.toml index 05ea90e..3ab81a2 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Domoticz" description.en = "Lightweight Home Automation System" description.fr = "Système domotique léger" -version = "2024.2~ynh1" +version = "2024.3~ynh1" maintainers = ["Krakinou"] @@ -53,12 +53,12 @@ ram.runtime = "50M" [resources] [resources.sources.main] - 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" + arm64.url = "https://github.com/domoticz/domoticz/releases/download/2024.3/domoticz_linux_aarch64.tgz" + arm64.sha256 = "69ae855a54b8425ae77a899e415e2fbd7a8b79d81ca19c6fbad6b95748117168" + armhf.url = "https://github.com/domoticz/domoticz/releases/download/2024.3/domoticz_linux_armv7l.tgz" + armhf.sha256 = "9884ab81e877b0c9d3c6f12b263127e5971151fda7b55be7da65dd6978ad1db1" + amd64.url = "https://github.com/domoticz/domoticz/releases/download/2024.3/domoticz_linux_x86_64.tgz" + amd64.sha256 = "ff1d7c99ad8d8097e0082e277bc5b5764ca25c676e510d05f70e477feb3382d1" format="tar.gz" in_subdir=false extract=true From a69cb1952f57ea5945acb566110924fbd6352d11 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 25 Jan 2024 21:19:46 +0000 Subject: [PATCH 2/6] 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 5d40560..2eea8dd 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ For example this system can be used with: The MQTT broker Mosquitto is integrated into the package and requires its own domain or subdomain. It's an optional setting. You may also install the [Mosquitto package](https://github.com/YunoHost-Apps/mosquitto_ynh) without using the one provided by domoticz_ynh. -**Shipped version:** 2024.2~ynh1 +**Shipped version:** 2024.3~ynh1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 9bac8bd..13dca5a 100644 --- a/README_fr.md +++ b/README_fr.md @@ -35,7 +35,7 @@ Vous pouvez également installer le [package pour Mosquitto](https://github.com/ -**Version incluse :** 2024.2~ynh1 +**Version incluse :** 2024.3~ynh1 ## Captures d’écran From b912b009c095bc87fa2599474c6566d0b9976f6b Mon Sep 17 00:00:00 2001 From: Krakinou Date: Thu, 25 Jan 2024 22:20:19 +0100 Subject: [PATCH 3/6] Remove auto-update as filename change --- manifest.toml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/manifest.toml b/manifest.toml index 3ab81a2..2c0e1ba 100644 --- a/manifest.toml +++ b/manifest.toml @@ -63,12 +63,7 @@ ram.runtime = "50M" in_subdir=false extract=true - autoupdate.strategy = "latest_github_release" - autoupdate.asset.arm64 = "*_aarch64.tgz" - autoupdate.asset.amd64 = "*_x86_64.tgz" - autoupdate.asset.armhf = "*_armhf.tgz" - [resources.system_user] [resources.install_dir] From 8f88b2bc184d0cfaa3688c8f045e2d4a972df0c8 Mon Sep 17 00:00:00 2001 From: Krakinou Date: Thu, 25 Jan 2024 22:25:44 +0100 Subject: [PATCH 4/6] Update test case --- tests.toml | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/tests.toml b/tests.toml index 7a6e53f..d214e61 100644 --- a/tests.toml +++ b/tests.toml @@ -14,11 +14,16 @@ test_format = 1.0 """ args.mqtt_domain="sub.domain.tld" - test_upgrade_from.a96510c.name = "2024.2" + test_upgrade_from.a96510c.name = "last packaging V1" test_upgrade_from.a96510c.args.mqtt_domain="sub.domain.tld" test_upgrade_from.a96510c.args.domain="sub.domain.tld" test_upgrade_from.a96510c.args.path="/domoticz" -# exclude = ["package_linter", "install.root", "install.subdir", "install.private", "install.multi", "backup_restore", "upgrade", "upgrade.a96510c", "change_url"] + + args.mqtt_domain="sub.domain.tld" + test_upgrade_from.f8dbadb.name = "2024.2 packagingv2" + test_upgrade_from.f8dbadb.args.mqtt_domain="sub.domain.tld" + test_upgrade_from.f8dbadb.args.domain="sub.domain.tld" + test_upgrade_from.f8dbadb.args.path="/domoticz" [With_Mosquitto_upgrade_with_mosquitto] preinstall = """ @@ -30,11 +35,16 @@ test_format = 1.0 exclude = ["package_linter"] - test_upgrade_from.a96510c.name = "2024.2 with mosquitto" + test_upgrade_from.a96510c.name = "last packaging v1 with mosquitto" test_upgrade_from.a96510c.args.mqtt_domain="mqtt.domain.tld" test_upgrade_from.a96510c.args.domain="sub.domain.tld" test_upgrade_from.a96510c.args.path="/domoticz" + test_upgrade_from.f8dbadb.name = "2024.2 packagingv2 with mosquitto" + test_upgrade_from.f8dbadb.args.mqtt_domain="mqtt.domain.tld" + test_upgrade_from.f8dbadb.args.domain="sub.domain.tld" + test_upgrade_from.f8dbadb.args.path="/domoticz" + [Without_Mosquitto_upgrade_with_mosquitto] preinstall = """ set -euxo pipefail @@ -51,7 +61,13 @@ test_format = 1.0 # exclude = ["package_linter", "install.root", "install.subdir", "install.private", "install.multi", "backup_restore", "change_url"] - test_upgrade_from.a96510c.name = "2024.2 without mosquitto" + test_upgrade_from.a96510c.name = "last packaging v1 without mosquitto" test_upgrade_from.a96510c.args.mqtt_domain="sub.domain.tld" test_upgrade_from.a96510c.args.domain="sub.domain.tld" - test_upgrade_from.a96510c.args.path="/domoticz" \ No newline at end of file + test_upgrade_from.a96510c.args.path="/domoticz" + + test_upgrade_from.f8dbadb.name = "2024.2 packagingv2 without mosquitto" + test_upgrade_from.f8dbadb.args.mqtt_domain="sub.domain.tld" + test_upgrade_from.f8dbadb.args.domain="sub.domain.tld" + test_upgrade_from.f8dbadb.args.path="/domoticz" + \ No newline at end of file From 60ae281e05dde83f199324ddbbbdd4f60c6134d6 Mon Sep 17 00:00:00 2001 From: Krakinou Date: Thu, 25 Jan 2024 23:11:51 +0100 Subject: [PATCH 5/6] duplicated key --- tests.toml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tests.toml b/tests.toml index d214e61..33a755c 100644 --- a/tests.toml +++ b/tests.toml @@ -14,12 +14,12 @@ test_format = 1.0 """ args.mqtt_domain="sub.domain.tld" + test_upgrade_from.a96510c.name = "last packaging V1" test_upgrade_from.a96510c.args.mqtt_domain="sub.domain.tld" test_upgrade_from.a96510c.args.domain="sub.domain.tld" test_upgrade_from.a96510c.args.path="/domoticz" - args.mqtt_domain="sub.domain.tld" test_upgrade_from.f8dbadb.name = "2024.2 packagingv2" test_upgrade_from.f8dbadb.args.mqtt_domain="sub.domain.tld" test_upgrade_from.f8dbadb.args.domain="sub.domain.tld" @@ -59,8 +59,6 @@ test_format = 1.0 args.mqtt_domain="sub.domain.tld" only = ["upgrade","upgrade.a96510c"] -# exclude = ["package_linter", "install.root", "install.subdir", "install.private", "install.multi", "backup_restore", "change_url"] - test_upgrade_from.a96510c.name = "last packaging v1 without mosquitto" test_upgrade_from.a96510c.args.mqtt_domain="sub.domain.tld" test_upgrade_from.a96510c.args.domain="sub.domain.tld" From cc3518e80dfe8f22641e2daf4db765b7caf4e1aa Mon Sep 17 00:00:00 2001 From: Krakinou Date: Fri, 26 Jan 2024 01:07:38 +0100 Subject: [PATCH 6/6] Fix Update message Patch --- ...index.html.patch => main-index.html.patch} | 25 +++++++++---------- 1 file changed, 12 insertions(+), 13 deletions(-) rename sources/patches/{app-index.html.patch => main-index.html.patch} (69%) diff --git a/sources/patches/app-index.html.patch b/sources/patches/main-index.html.patch similarity index 69% rename from sources/patches/app-index.html.patch rename to sources/patches/main-index.html.patch index f23c0cc..eb1b85e 100644 --- a/sources/patches/app-index.html.patch +++ b/sources/patches/main-index.html.patch @@ -1,26 +1,25 @@ ---- a/www/index.html 2023-02-26 22:22:14.971932399 +0100 -+++ b/www/index.html 2023-02-26 22:27:12.926431427 +0100 -@@ -170,14 +170,15 @@ +--- a/www/index.html 2024-01-24 12:00:41.000000000 +0100 ++++ b/www/index.html 2024-01-26 00:56:22.766868427 +0100 +@@ -154,13 +154,14 @@ } function ShowUpdateNotification(Revision, SystemName, DownloadURL) { - var msgtxt=$.t('A new version of Domoticz is Available!...'); + -+ var msgtxt=$.t('A new version of Domoticz is Available, please wait for the Yunohost Package!...'); ++ var msgtxt=$.t('A new version of Domoticz is Available, please wait for the YunoHost Package!...'); msgtxt+='
' + $.t('Version') + ': ' + Revision + ', ' + $.t('Latest Changes') + ': ' + $.t('Click Here') + ''; -- if (SystemName=="windows") { -+ } else { - msgtxt+='
' + $.t('Update Now') + '
'; -- } -+ }--> +- msgtxt+='
' + $.t('Update Now') + '
'; ++ + } generate_noty('success', msgtxt, false); } - -@@ -1330,8 +1331,8 @@ -
  • Devices
    • +@@ -1264,8 +1265,8 @@ +
  • Users
  • Settings
  • -
  • Update Domoticz