Merge pull request #26 from YunoHost-Apps/master

2024.3

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
 

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
 

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,22 +53,17 @@ 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.url = "https://github.com/domoticz/domoticz/releases/download/2024.3/domoticz_linux_aarch64.tgz"
-        arm64.sha256 = "d0ee6660c1c05c2949bfbe669de0029795f5974a5f00b6818c0aefba944b3fd6"
+        arm64.sha256 = "69ae855a54b8425ae77a899e415e2fbd7a8b79d81ca19c6fbad6b95748117168"
-        armhf.url = "https://github.com/domoticz/domoticz/releases/download/2024.2/domoticz_linux_2024.2_armv7l.tgz"
+        armhf.url = "https://github.com/domoticz/domoticz/releases/download/2024.3/domoticz_linux_armv7l.tgz"
-        armhf.sha256 = "23eb3f4d2c818761773a45282b054f2707808005643ceba10a386cb1cf93db0a"
+        armhf.sha256 = "9884ab81e877b0c9d3c6f12b263127e5971151fda7b55be7da65dd6978ad1db1"
-        amd64.url = "https://github.com/domoticz/domoticz/releases/download/2024.2/domoticz_linux_2024.2_x86_64.tgz"
+        amd64.url = "https://github.com/domoticz/domoticz/releases/download/2024.3/domoticz_linux_x86_64.tgz"
-        amd64.sha256 = "0f973af6dcadef17d75ac7372dfc2f0a87bd0fabca8db04348fe34bd1d0180e2"
+        amd64.sha256 = "ff1d7c99ad8d8097e0082e277bc5b5764ca25c676e510d05f70e477feb3382d1"
         format="tar.gz"
         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]

sources/patches/main-index.html.patch

@@ -1,26 +1,25 @@
---- a/www/index.html	2023-02-26 22:22:14.971932399 +0100
+--- a/www/index.html	2024-01-24 12:00:41.000000000 +0100
-+++ b/www/index.html	2023-02-26 22:27:12.926431427 +0100
++++ b/www/index.html	2024-01-26 00:56:22.766868427 +0100
-@@ -170,14 +170,15 @@
+@@ -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!...');-->
-+	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+='<br>' + $.t('Version') + ': <b>' + Revision + '</b>, ' + $.t('Latest Changes') + ': <b><a class="norm-link" onclick="ShowLatestHistory();">' + $.t('Click Here') + '</a></b>';
--	if (SystemName=="windows") {
+ 	if (SystemName=="windows") {
-+	<!--if (SystemName=="windows") {
+-		msgtxt+='<br><center><a class="btn btn-danger" onclick="WindowsDownloadURL(\'' + DownloadURL + '\')">' + $.t('Update Now') + '</a></center>';
- 		msgtxt+='<br><center><a class="btn btn-danger" onclick="WindowsDownloadURL(\'' + DownloadURL + '\')">' + $.t('Update Now') + '</a></center>';
++<!--		msgtxt+='<br><center><a class="btn btn-danger" onclick="WindowsDownloadURL(\'' + DownloadURL + '\')">' + $.t('Update Now') + '</a></center>';-->
  	}
  	else {
- 		msgtxt+='<br><center><a class="btn btn-danger" onclick="SwitchLayout(\'Update\');">' + $.t('Update Now') + '</a></center>';
+-		msgtxt+='<br><center><a class="btn btn-danger" onclick="SwitchLayout(\'Update\');">' + $.t('Update Now') + '</a></center>';
--	}
++<!--		msgtxt+='<br><center><a class="btn btn-danger" onclick="SwitchLayout(\'Update\');">' + $.t('Update Now') + '</a></center>';-->
-+	}-->
+ 	}
  	generate_noty('success', msgtxt, false);
  }
- 
+@@ -1264,8 +1265,8 @@
-@@ -1330,8 +1331,8 @@
+ 							<li ng-class="{'current_page_item':getClass('/Users')}" id="mUsers"><a id="cUsers" href="#Users"><img src="images/users.png"> <span data-i18n="Users">Users</span></a></li>
- 							<li ng-class="{'current_page_item':getClass('/Devices')}" id="mDevices"><a id="cDevices" href="#Devices"><img src="images/devices.png"> <span data-i18n="Devices">Devices</span></a></li>
  							<li ng-class="{'current_page_item':getClass('/Setup')}" id="mSetup"><a id="cSetup" href="#Setup"><img src="images/setup.png"> <span data-i18n="Settings">Settings</span></a></li>
  							<li id="dUpdate" class="divider"></li>
 -							<li ng-show="config.HaveUpdate && config.UseUpdate"><a href="#Update"><img src="images/update.png"> <span data-i18n="Update Domoticz">Update Domoticz</span></a></li>

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"]
+
+    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
@@ -49,9 +59,13 @@ 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.name = "2024.2 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"
+    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"
+