From a70f97d5ed4dd5601dcec494d4695502dfb64755 Mon Sep 17 00:00:00 2001
From: Krakinou <misterl56@hotmail.com>
Date: Sun, 7 May 2023 15:08:57 +0200
Subject: [PATCH 1/9] Use already compiled sources

---
 conf/app.src          |  6 ---
 conf/systemd.service  |  4 +-
 doc/PRE_INSTALL.md    |  3 --
 doc/PRE_INSTALL_fr.md |  3 --
 manifest.toml         | 26 +++++++++---
 scripts/_common.sh    | 95 -------------------------------------------
 scripts/install       | 89 ++++++++++++++++++++++------------------
 scripts/remove        | 10 ++---
 scripts/restore       |  6 +--
 scripts/upgrade       | 78 +++++++++++++++++------------------
 10 files changed, 118 insertions(+), 202 deletions(-)
 delete mode 100644 conf/app.src

diff --git a/conf/app.src b/conf/app.src
deleted file mode 100644
index 8da8495..0000000
--- a/conf/app.src
+++ /dev/null
@@ -1,6 +0,0 @@
-SOURCE_URL=https://api.github.com/repos/zwave-js/zwave-js-ui/zipball/v8.14.1
-SOURCE_SUM=9a6a4c66dc915e207e3bcb7957b55409d2487081d4ffd5bf8de3e9ec2df03503
-SOURCE_SUM_PRG=sha256sum
-SOURCE_FORMAT=zip
-SOURCE_IN_SUBDIR=true
-SOURCE_EXTRACT=true
diff --git a/conf/systemd.service b/conf/systemd.service
index 68e74fc..81cec7d 100644
--- a/conf/systemd.service
+++ b/conf/systemd.service
@@ -6,10 +6,8 @@ After=network.target
 Type=simple
 User=__APP__
 Group=__APP__
-#Environment not working, don't know why, have to add env command to ExecStart, if you know a better way, don't hesitate to make a PR
-#Environment="__YNH_NODE_LOAD_PATH__"
 WorkingDirectory=__INSTALL_DIR__/
-ExecStart=env __YNH_NODE_LOAD_PATH__ yarn start
+ExecStart=__INSTALL_DIR__/__FILE_EXEC__
 StandardOutput=append:/var/log/__APP__/__APP__.log
 StandardError=inherit
 
diff --git a/doc/PRE_INSTALL.md b/doc/PRE_INSTALL.md
index 6f15d96..2869682 100644
--- a/doc/PRE_INSTALL.md
+++ b/doc/PRE_INSTALL.md
@@ -1,6 +1,3 @@
-Beware!
-A temporary swap file will be created during install if less than 2Gb of memory (RAM+Swap) are available : Be sure to have enough space on disk!
-
 To work correctly, this app require to install either
 - [domoticz package](https://github.com/YunoHost-Apps/domoticz_ynh) with **mqtt broker Mosquitto**
 - [Home-Assistant package](https://github.com/YunoHost-Apps/homeassistant_ynh)
\ No newline at end of file
diff --git a/doc/PRE_INSTALL_fr.md b/doc/PRE_INSTALL_fr.md
index 37dd1b3..e26d48b 100644
--- a/doc/PRE_INSTALL_fr.md
+++ b/doc/PRE_INSTALL_fr.md
@@ -1,6 +1,3 @@
-Attention!
-Un fichier de swap temporaire sera créé durant l'installation si moins de 2Go de mémoire (RAM+Swap) sont disponibles : Assurez vous d'avoir assez d'espace disque!
-
 Pour fonctionner correctement, cette application nécessite d'avoir installé soit:
 - le package [domoticz](https://github.com/YunoHost-Apps/domoticz_ynh) avec le **broker MQTT mosquitto**
 - le package [Home-Assistant](https://github.com/YunoHost-Apps/homeassistant_ynh)
\ No newline at end of file
diff --git a/manifest.toml b/manifest.toml
index b213c30..6a1e3b9 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -5,7 +5,7 @@ name = "Zwave-JS-UI"
 description.en = "Full featured Z-Wave Control Panel and MQTT Gateway integrated with domoticz"
 description.fr = "Panneau de controle Z-Wave et MQTT intégré avec Domoticz"
 
-version = "8.14.1~ynh1"
+version = "8.15.0~ynh2"
 
 maintainers = ["Krakinou"]
 
@@ -18,13 +18,13 @@ code = "https://github.com/zwave-js/zwave-js-ui"
 fund = "https://liberapay.com/robertsLando/donate"
 
 [integration]
-yunohost = ">= 11.1.11"
-architectures = "all"
+yunohost = ">= 11.1.18"
+architectures = "arm64 armhf amd64"
 multi_instance = false
 ldap = "not_relevant"
 sso = "not_relevant"
-disk = "650M"
-ram.build = "2G"
+disk = "350M"
+ram.build = "100M"
 ram.runtime = "100M"
 
 [install]
@@ -42,6 +42,22 @@ ram.runtime = "100M"
     default = "all_users"
 
 [resources]
+        [resources.sources.main]
+        arm64.url = "https://github.com/zwave-js/zwave-js-ui/releases/download/v8.15.0/zwave-js-ui-v8.15.0-linux-arm64.zip"
+        arm64.sha256 = "092c538cb865d1591fc2c46cc08ad7aff57847ac14f396067e9e1339f4d5b344"
+        armhf.url = "https://github.com/zwave-js/zwave-js-ui/releases/download/v8.15.0/zwave-js-ui-v8.15.0-linux-armv7.zip"
+        armhf.sha256 = "6fddd163a8158e8d8ff42a604cc563b77d6893ad698c3a70ed4c43dc8444b6ae"
+        amd64.url = "https://github.com/zwave-js/zwave-js-ui/releases/download/v8.15.0/zwave-js-ui-v8.15.0-linux.zip"
+        amd64.sha256 = "a479b01abcd1d597806918e0b2d31466306cca7c8a87af1dc9e3fcc08750dc1c"
+        format="zip"
+        in_subdir=false
+        extract=true
+
+        autoupdate.strategy = "latest_github_release"
+
+        autoupdate.asset.arm64 = "*-arm64.zip"
+        autoupdate.asset.amd64 = "*-linux.zip"
+        autoupdate.asset.armhf = "*-armv7.zip"
     [resources.system_user]
 
     [resources.install_dir]
diff --git a/scripts/_common.sh b/scripts/_common.sh
index 972675b..69c72c9 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -3,8 +3,6 @@
 #=================================================
 # COMMON VARIABLES
 #=================================================
-MEMORY_NEEDED="2048"
-NODEJS_VERSION=18
 
 #=================================================
 # PERSONAL HELPERS
@@ -14,99 +12,6 @@ NODEJS_VERSION=18
 # EXPERIMENTAL HELPERS
 #=================================================
 
-# Add swap
-#
-# usage: ynh_add_swap --size=SWAP in Mb
-# | arg: -s, --size= - Amount of SWAP to add in Mb.
-ynh_add_swap () {
-	# Declare an array to define the options of this helper.
-	declare -Ar args_array=( [s]=size= )
-	local size
-	# Manage arguments with getopts
-	ynh_handle_getopts_args "$@"
-
-	local swap_max_size=$(( $size * 1024 ))
-
-	local free_space=$(df --output=avail / | sed 1d)
-	# Because we don't want to fill the disk with a swap file, divide by 2 the available space.
-	local usable_space=$(( $free_space / 2 ))
-
- 	SD_CARD_CAN_SWAP=${SD_CARD_CAN_SWAP:-0}
-
-	# Swap on SD card only if it's is specified
-	if ynh_is_main_device_a_sd_card && [ "$SD_CARD_CAN_SWAP" == "0" ]
-	then
-		ynh_print_warn --message="The main mountpoint of your system '/' is on an SD card, swap will not be added to prevent some damage of this one, but that can cause troubles for the app $app. If you still want activate the swap, you can relaunch the command preceded by 'SD_CARD_CAN_SWAP=1'"
-		return
-	fi
-
-	# Compare the available space with the size of the swap.
-	# And set a acceptable size from the request
-	if [ $usable_space -ge $swap_max_size ]
-	then
-		local swap_size=$swap_max_size
-	elif [ $usable_space -ge $(( $swap_max_size / 2 )) ]
-	then
-		local swap_size=$(( $swap_max_size / 2 ))
-	elif [ $usable_space -ge $(( $swap_max_size / 3 )) ]
-	then
-		local swap_size=$(( $swap_max_size / 3 ))
-	elif [ $usable_space -ge $(( $swap_max_size / 4 )) ]
-	then
-		local swap_size=$(( $swap_max_size / 4 ))
-	else
-		echo "Not enough space left for a swap file" >&2
-		local swap_size=0
-	fi
-
-	# If there's enough space for a swap, and no existing swap here
-	if [ $swap_size -ne 0 ] && [ ! -e /swap_$app ]
-	then
-		# Preallocate space for the swap file, fallocate may sometime not be used, use dd instead in this case
-		if ! fallocate -l ${swap_size}K /swap_$app
-		then
-			dd if=/dev/zero of=/swap_$app bs=1024 count=${swap_size}
-		fi
-		chmod 0600 /swap_$app
-		# Create the swap
-		mkswap /swap_$app
-		# And activate it
-		swapon /swap_$app
-		# Then add an entry in fstab to load this swap at each boot.
-		echo -e "/swap_$app swap swap defaults 0 0 #Swap added by $app" >> /etc/fstab
-	fi
-}
-
-ynh_del_swap () {
-	# If there a swap at this place
-	if [ -e /swap_$app ]
-	then
-		# Clean the fstab
-		sed -i "/#Swap added by $app/d" /etc/fstab
-		# Desactive the swap file
-		swapoff /swap_$app
-		# And remove it
-		rm /swap_$app
-	fi
-}
-
-# Check if the device of the main mountpoint "/" is an SD card
-#
-# [internal]
-#
-# return 0 if it's an SD card, else 1
-ynh_is_main_device_a_sd_card () {
-	local main_device=$(lsblk --output PKNAME --noheadings $(findmnt / --nofsroot --uniq --output source --noheadings --first-only))
-
-	if echo $main_device | grep --quiet "mmc" && [ $(tail -n1 /sys/block/$main_device/queue/rotational) == "0" ]
-	then
-		return 0
-	e
-lse
-		return 1
-	fi
-}
-
 #=================================================
 # FUTURE OFFICIAL HELPERS
 #=================================================
\ No newline at end of file
diff --git a/scripts/install b/scripts/install
index 4f9c527..ac957fd 100755
--- a/scripts/install
+++ b/scripts/install
@@ -9,23 +9,30 @@
 source _common.sh
 source /usr/share/yunohost/helpers
 
+
+if [[ "$YNH_ARCH" == "armhf" ]] || [[ "$YNH_ARCH" == "arm64" ]]
+then
+    file_exec="zwave-js-ui"
+else
+    file_exec="zwave-js-ui-linux"
+fi
 #=================================================
 # ADD SWAP IF NEEDED
 #=================================================
 #https://github.com/zwave-js/zwave-js-ui/issues/2699
-ynh_script_progression --message="Checking for RAM..."
+#ynh_script_progression --message="Checking for RAM..."
 
-total_memory=$(ynh_get_ram --total)
-swap_needed=0
+#total_memory=$(ynh_get_ram --total)
+#swap_needed=0
 
-if [ $total_memory -lt $MEMORY_NEEDED ]; then
+#if [ $total_memory -lt $MEMORY_NEEDED ]; then
 	# Need a minimum of 2Go of memory
-	swap_needed=$(($MEMORY_NEEDED - $total_memory))
-	ynh_script_progression --message="Adding $swap_needed Mo to swap..."
-	SD_CARD_CAN_SWAP=1
-	ynh_add_swap --size=$swap_needed
+#	swap_needed=$(($MEMORY_NEEDED - $total_memory))
+#	ynh_script_progression --message="Adding $swap_needed Mo to swap..."
+#	SD_CARD_CAN_SWAP=1
+#	ynh_add_swap --size=$swap_needed
 
-fi
+#fi
 
 #=================================================
 # CREATE DEDICATED USER
@@ -50,58 +57,60 @@ fi
 #=================================================
 #REMOVEME? ynh_script_progression --message="Installing dependencies..." --weight=15
 
-ynh_install_nodejs --nodejs_version=$NODEJS_VERSION
-ynh_use_nodejs
-ynh_exec_warn_less $ynh_npm install ---global yarn
+#ynh_install_nodejs --nodejs_version=$NODEJS_VERSION
+#ynh_use_nodejs
+#ynh_exec_warn_less $ynh_npm install ---global yarn
 
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
 ynh_script_progression --message="Setting up source files..." --weight=8
 
-# Download, check integrity, uncompress and patch the source from app.src
-ynh_setup_source --dest_dir="$install_dir"
+# Download, check integrity, uncompress and patch the source
+ynh_setup_source --dest_dir="$install_dir" 
 
 chmod 750 "$install_dir"
 chmod -R o-rwx "$install_dir"
 chown -R $app: "$install_dir"
 
+
+
 #=================================================
 # BUILD FROM SOURCE
 #=================================================
-ynh_script_progression --message="Building from sources..." --weight=1
+#ynh_script_progression --message="Building from sources..." --weight=1
 
-pushd "$install_dir"
- 	ynh_script_progression --message="Fetching Yarn dependencies... This can be very long, be patient !" --weight=40
-	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn plugin import workspace-tools
-	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn workspaces focus --production
-	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn install --network-timeout 1000000000
-	#On slow/low memory system, yarn silently fails with a 0 return code and nothing seems to be doable about that so far.
-	#relaunching yarn install seems to do the trick for raspberry at least as it resumes from where it fails
-	#https://github.com/yarnpkg/berry/issues/3996
-	#https://github.com/yarnpkg/berry/issues/5065
-	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn install --network-timeout 1000000000
-	ynh_script_progression --message="Cleaning cache... " --weight=3
-	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn cache clean 2>&1
- 	ynh_script_progression --message="Building Yarn dependencies... This can be very long, be patient !" --weight=30
-	#https://geeklearning.io/angular-aot-webpack-memory-trick/
-	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH NODE_OPTIONS=--max-old-space-size=2048 yarn run build
-	ynh_script_progression --message="Cleaning cache... " --weight=3
-	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn cache clean 2>&1
-popd
+#pushd "$install_dir"
+# 	ynh_script_progression --message="Fetching Yarn dependencies... This can be very long, be patient !" --weight=40
+#	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn plugin import workspace-tools
+#	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn workspaces focus --production
+#	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn install --network-timeout 1000000000
+#	#On slow/low memory system, yarn silently fails with a 0 return code and nothing seems to be doable about that so far.
+#	#relaunching yarn install seems to do the trick for raspberry at least as it resumes from where it fails
+#	#https://github.com/yarnpkg/berry/issues/3996
+#	#https://github.com/yarnpkg/berry/issues/5065
+#	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn install --network-timeout 1000000000
+#	ynh_script_progression --message="Cleaning cache... " --weight=3
+#	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn cache clean 2>&1
+ #	ynh_script_progression --message="Building Yarn dependencies... This can be very long, be patient !" --weight=30
+	##https://geeklearning.io/angular-aot-webpack-memory-trick/
+#	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH NODE_OPTIONS=--max-old-space-size=2048 yarn run build
+#	ynh_script_progression --message="Cleaning cache... " --weight=3
+#	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn cache clean 2>&1
+#popd
 
-chmod 750 "$install_dir"
-chmod -R o-rwx "$install_dir"
-chown -R $app: "$install_dir"
+#chmod 750 "$install_dir"
+#chmod -R o-rwx "$install_dir"
+#chown -R $app: "$install_dir"
 
 
 #=================================================
 # REMOVE ADDITIONNAL SWAP
 #=================================================
-if [ $swap_needed > 0 ]; then
-	ynh_script_progression --message="Remove additionnal swap..." --weight=2
-	ynh_del_swap
-fi
+#if [ $swap_needed > 0 ]; then
+#	ynh_script_progression --message="Remove additionnal swap..." --weight=2
+#	ynh_del_swap
+#fi
 #=================================================
 # NGINX CONFIGURATION
 #=================================================
diff --git a/scripts/remove b/scripts/remove
index 79780d6..aec5c7b 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -28,13 +28,13 @@ ynh_remove_systemd_config
 
 ynh_remove_logrotate
 
-ynh_remove_nodejs
+#ynh_remove_nodejs
 
 #In case install or upgrade went wrong, remove script is launched, so we need to ensure additional swap is deleted
-if [ -e /swap_$app ]; then
-	ynh_script_progression --message="Remove additionnal swap..." --weight=2
-	ynh_del_swap
-fi
+#if [ -e /swap_$app ]; then
+#	ynh_script_progression --message="Remove additionnal swap..." --weight=2
+#	ynh_del_swap
+#fi
 
 ynh_remove_nginx_config
 
diff --git a/scripts/restore b/scripts/restore
index 055d5ac..0293402 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -31,9 +31,9 @@ fi
 #=================================================
 #REMOVEME? ynh_script_progression --message="Installing dependencies..." --weight=15
 
-ynh_install_nodejs --nodejs_version=$NODEJS_VERSION
-ynh_use_nodejs
-ynh_exec_warn_less $ynh_npm install ---global yarn
+#ynh_install_nodejs --nodejs_version=$NODEJS_VERSION
+#ynh_use_nodejs
+#ynh_exec_warn_less $ynh_npm install ---global yarn
 
 #=================================================
 # RESTORE THE APP MAIN DIR
diff --git a/scripts/upgrade b/scripts/upgrade
index fe9ba89..03f571f 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -33,20 +33,20 @@ ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app
 # ADD SWAP IF NEEDED
 #=================================================
 #https://github.com/zwave-js/zwave-js-ui/issues/2699
-if [ "$upgrade_type" == "UPGRADE_APP" ]; then
-	ynh_script_progression --message="Checking for RAM..."
+#if [ "$upgrade_type" == "UPGRADE_APP" ]; then
+#	ynh_script_progression --message="Checking for RAM..."
 
-	total_memory=$(ynh_get_ram --total)
-	swap_needed=0
+#	total_memory=$(ynh_get_ram --total)
+#	swap_needed=0
 
-	if [ $total_memory -lt $MEMORY_NEEDED ]; then
-		# Need a minimum of 2Go of memory
-		swap_needed=$(($MEMORY_NEEDED - $total_memory))
-		ynh_script_progression --message="Adding $swap_needed Mo to swap..."
-		SD_CARD_CAN_SWAP=1
-		ynh_add_swap --size=$swap_needed
-	fi
-fi
+#	if [ $total_memory -lt $MEMORY_NEEDED ]; then
+#		# Need a minimum of 2Go of memory
+#		swap_needed=$(($MEMORY_NEEDED - $total_memory))
+#		ynh_script_progression --message="Adding $swap_needed Mo to swap..."
+#		SD_CARD_CAN_SWAP=1
+#		ynh_add_swap --size=$swap_needed
+#	fi
+#fi
 
 #=================================================
 # CREATE DEDICATED USER
@@ -68,9 +68,9 @@ fi
 #=================================================
 #REMOVEME? ynh_script_progression --message="Upgrading dependencies..." --weight=1
 
-ynh_install_nodejs --nodejs_version=$NODEJS_VERSION
-ynh_use_nodejs
-ynh_exec_warn_less $ynh_npm install ---global yarn
+#ynh_install_nodejs --nodejs_version=$NODEJS_VERSION
+#ynh_use_nodejs
+#ynh_exec_warn_less $ynh_npm install ---global yarn
 
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
@@ -87,41 +87,41 @@ then
 	chmod -R o-rwx "$install_dir"
 	chown -R $app: "$install_dir"
 	
-	ynh_script_progression --message="Building from sources..." --weight=15
-	pushd "$install_dir"
-		ynh_script_progression --message="Fetching Yarn dependencies... This can be very long, be patient !" --weight=18
-		ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn plugin import workspace-tools
-		ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn workspaces focus --production
-		ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn install --network-timeout 1000000000
+#	ynh_script_progression --message="Building from sources..." --weight=15
+#	pushd "$install_dir"
+#		ynh_script_progression --message="Fetching Yarn dependencies... This can be very long, be patient !" --weight=18
+#		ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn plugin import workspace-tools
+#		ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn workspaces focus --production
+#		ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn install --network-timeout 1000000000
 		#On slow/low memory system, yarn silently fails with a 0 return code and nothing seems to be doable about that so far.
 		#relaunching yarn install seems to do the trick for raspberry at least as it resumes from where it fails
 		#https://github.com/yarnpkg/berry/issues/3996
 		#https://github.com/yarnpkg/berry/issues/5065
-		ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn install --network-timeout 1000000000
-		ynh_script_progression --message="Cleaning cache... " --weight=3
-		ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn cache clean 2>&1
- 		ynh_script_progression --message="Building Yarn dependencies... This can be very long, be patient !" --weight=18
+#		ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn install --network-timeout 1000000000
+#		ynh_script_progression --message="Cleaning cache... " --weight=3
+#		ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn cache clean 2>&1
+ #		ynh_script_progression --message="Building Yarn dependencies... This can be very long, be patient !" --weight=18
 		#https://geeklearning.io/angular-aot-webpack-memory-trick/
-		ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH NODE_OPTIONS=--max-old-space-size=2048 yarn run build
-		ynh_script_progression --message="Cleaning cache... " --weight=3
-		ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn cache clean 2>&1
-	popd
-
-	chmod 750 "$install_dir"
-	chmod -R o-rwx "$install_dir"
-	chown -R $app: "$install_dir"
+#		ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH NODE_OPTIONS=--max-old-space-size=2048 yarn run build
+#		ynh_script_progression --message="Cleaning cache... " --weight=3
+#		ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn cache clean 2>&1
+#	popd
 
+#	chmod 750 "$install_dir"
+#	chmod -R o-rwx "$install_dir"
+#	chown -R $app: "$install_dir"
+#
 fi
 
 #=================================================
 # REMOVE ADDITIONNAL SWAP
 #=================================================
-if [ "$upgrade_type" == "UPGRADE_APP" ]; then
-	if [ $swap_needed > 0 ]; then
-		ynh_script_progression --message="Remove additionnal swap..." --weight=2
-		ynh_del_swap
-	fi
-fi
+#if [ "$upgrade_type" == "UPGRADE_APP" ]; then
+#	if [ $swap_needed > 0 ]; then
+#		ynh_script_progression --message="Remove additionnal swap..." --weight=2
+#		ynh_del_swap
+#	fi
+#fi
 
 #=================================================
 # NGINX CONFIGURATION

From 51fa89250d23cba8754fa141c104dd8c49988327 Mon Sep 17 00:00:00 2001
From: yunohost-bot <yunohost@yunohost.org>
Date: Sun, 7 May 2023 13:09:04 +0000
Subject: [PATCH 2/9] 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 5985683..e57240a 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@ For now, although the package is fully functional (install, remove, backup, rest
 During install, the whole app need to be recompile using yarn, this lead to long installation time. Also, a temporary swap file will be created if less than 2Gb of memory (RAM+Swap) are available : Be sure to have enough space on disk.
 
 
-**Shipped version:** 8.14.1~ynh1
+**Shipped version:** 8.15.0~ynh2
 ## Documentation and resources
 
 * Official app website: <https://zwave-js.github.io/zwave-js-ui/#/>
diff --git a/README_fr.md b/README_fr.md
index dc57946..6215877 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -32,7 +32,7 @@ Pour l'instant, bien que le package fonctionne (installation, désinstallation,
 
 Pendant l'installation, la totalité de l'application doit être recompilé en utilisant yarn : cela amène à des temps d'installation très long. Un fichier de swap temporaire sera créé si moins de 2Go de mémoire sont disponibles (RAM + swap): Assurez vous d'avoir suffisament d'espace disque.
 
-**Version incluse :** 8.14.1~ynh1
+**Version incluse :** 8.15.0~ynh2
 ## Documentations et ressources
 
 * Site officiel de l’app : <https://zwave-js.github.io/zwave-js-ui/#/>

From b558454b937421c290d5cf0cac5dfd8b59a37488 Mon Sep 17 00:00:00 2001
From: Krakinou <misterl56@hotmail.com>
Date: Sun, 7 May 2023 15:21:57 +0200
Subject: [PATCH 3/9] remove compile information

---
 doc/DESCRIPTION.md    | 2 --
 doc/DESCRIPTION_fr.md | 2 --
 2 files changed, 4 deletions(-)

diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md
index 24030a8..56a5101 100644
--- a/doc/DESCRIPTION.md
+++ b/doc/DESCRIPTION.md
@@ -12,5 +12,3 @@ To work correctly, this app require to install either
 
 For now, although the package is fully functional (install, remove, backup, restore...), it is not integrated with domoticz and mosquitto package, this means that all settings needs to be done manually from inside the app.
 
-
-During install, the whole app need to be recompile using yarn, this lead to long installation time. Also, a temporary swap file will be created if less than 2Gb of memory (RAM+Swap) are available : Be sure to have enough space on disk.
diff --git a/doc/DESCRIPTION_fr.md b/doc/DESCRIPTION_fr.md
index abe4bfb..57437e8 100644
--- a/doc/DESCRIPTION_fr.md
+++ b/doc/DESCRIPTION_fr.md
@@ -11,5 +11,3 @@ Pour fonctionner correctement, cette application nécessite d'avoir installé so
 
 
 Pour l'instant, bien que le package fonctionne (installation, désinstallation, sauvegarde, restauration...), il n'est pas intégré avec domoticz et mosquitto, les paramétrages doivent être fait manuellement depuis l'application.
-
-Pendant l'installation, la totalité de l'application doit être recompilé en utilisant yarn : cela amène à des temps d'installation très long. Un fichier de swap temporaire sera créé si moins de 2Go de mémoire sont disponibles (RAM + swap): Assurez vous d'avoir suffisament d'espace disque.
\ No newline at end of file

From 5f7b1471ffc902bb38759451d66e40ef57740604 Mon Sep 17 00:00:00 2001
From: yunohost-bot <yunohost@yunohost.org>
Date: Sun, 7 May 2023 13:22:25 +0000
Subject: [PATCH 4/9] Auto-update README

---
 README.md    | 2 --
 README_fr.md | 1 -
 2 files changed, 3 deletions(-)

diff --git a/README.md b/README.md
index e57240a..9db4fbd 100644
--- a/README.md
+++ b/README.md
@@ -31,8 +31,6 @@ To work correctly, this app require to install either
 For now, although the package is fully functional (install, remove, backup, restore...), it is not integrated with domoticz and mosquitto package, this means that all settings needs to be done manually from inside the app.
 
 
-During install, the whole app need to be recompile using yarn, this lead to long installation time. Also, a temporary swap file will be created if less than 2Gb of memory (RAM+Swap) are available : Be sure to have enough space on disk.
-
 
 **Shipped version:** 8.15.0~ynh2
 ## Documentation and resources
diff --git a/README_fr.md b/README_fr.md
index 6215877..aef8f66 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -30,7 +30,6 @@ Pour fonctionner correctement, cette application nécessite d'avoir installé so
 
 Pour l'instant, bien que le package fonctionne (installation, désinstallation, sauvegarde, restauration...), il n'est pas intégré avec domoticz et mosquitto, les paramétrages doivent être fait manuellement depuis l'application.
 
-Pendant l'installation, la totalité de l'application doit être recompilé en utilisant yarn : cela amène à des temps d'installation très long. Un fichier de swap temporaire sera créé si moins de 2Go de mémoire sont disponibles (RAM + swap): Assurez vous d'avoir suffisament d'espace disque.
 
 **Version incluse :** 8.15.0~ynh2
 ## Documentations et ressources

From f69d8f7c1f9e20fdc7df2ef670285690142320fa Mon Sep 17 00:00:00 2001
From: Krakinou <misterl56@hotmail.com>
Date: Sun, 7 May 2023 15:22:37 +0200
Subject: [PATCH 5/9] typo in architectures

---
 manifest.toml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/manifest.toml b/manifest.toml
index 6a1e3b9..d33b272 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -19,13 +19,13 @@ fund = "https://liberapay.com/robertsLando/donate"
 
 [integration]
 yunohost = ">= 11.1.18"
-architectures = "arm64 armhf amd64"
+architectures = [ "amd64", "armhf", "arm64" ]
 multi_instance = false
 ldap = "not_relevant"
 sso = "not_relevant"
 disk = "350M"
-ram.build = "100M"
-ram.runtime = "100M"
+ram.build = "200M"
+ram.runtime = "150M"
 
 [install]
     [install.domain]

From e7f9be882afda5769d6ce2469ed370ef1c75ec6b Mon Sep 17 00:00:00 2001
From: Krakinou <misterl56@hotmail.com>
Date: Sun, 7 May 2023 15:24:29 +0200
Subject: [PATCH 6/9] remove old updater

---
 .github/workflows/updater.sh  | 132 ----------------------------------
 .github/workflows/updater.yml |  50 -------------
 2 files changed, 182 deletions(-)
 delete mode 100755 .github/workflows/updater.sh
 delete mode 100644 .github/workflows/updater.yml

diff --git a/.github/workflows/updater.sh b/.github/workflows/updater.sh
deleted file mode 100755
index 9cf5bef..0000000
--- a/.github/workflows/updater.sh
+++ /dev/null
@@ -1,132 +0,0 @@
-#!/bin/bash
-
-#=================================================
-# FETCHING LATEST RELEASE AND ITS ASSETS
-#=================================================
-
-#Installing tomlq
-python3 -m venv venv
-source venv/bin/activate
-pip3 install tomlq
-
-# Fetching information
-current_version=$(cat manifest.toml | tomlq -j '.version|split("~")[0]')
-repo=$(cat manifest.toml | tomlq -j '.upstream.code|split("https://github.com/")[1]')
-
-# Some jq magic is needed, because the latest upstream release is not always the latest version (e.g. security patches for older versions)
-version=$(curl --silent "https://api.github.com/repos/$repo/releases" | jq -r '.[] | select( .prerelease != true ) | .tag_name' | sort -V | tail -1)
-assets=($(curl --silent "https://api.github.com/repos/$repo/releases" | jq -r '[ .[] | select(.tag_name=="'$version'").zipball_url ] | join(" ") | @sh' | tr -d "'"))
-
-# Later down the script, we assume the version has only digits and dots
-# Sometimes the release name starts with a "v", so let's filter it out.
-# You may need more tweaks here if the upstream repository has different naming conventions.
-if [[ ${version:0:1} == "v" || ${version:0:1} == "V" ]]; then
-    version=${version:1}
-fi
-
-# Setting up the environment variables
-echo "Current version: $current_version"
-echo "Latest release from upstream: $version"
-echo "VERSION=$version" >> $GITHUB_ENV
-echo "REPO=$repo" >> $GITHUB_ENV
-# For the time being, let's assume the script will fail
-echo "PROCEED=false" >> $GITHUB_ENV
-
-# Proceed only if the retrieved version is greater than the current one
-if ! dpkg --compare-versions "$current_version" "lt" "$version" ; then
-    echo "::warning ::No new version available"
-    rm -rf ./venv
-    exit 0
-# Proceed only if a PR for this new version does not already exist
-elif git ls-remote -q --exit-code --heads https://github.com/$GITHUB_REPOSITORY.git ci-auto-update-v$version ; then
-    echo "::warning ::A branch already exists for this update"
-    rm -rf ./venv
-    exit 0
-fi
-
-# Each release can hold multiple assets (e.g. binaries for different architectures, source code, etc.)
-echo "${#assets[@]} available asset(s)"
-
-#=================================================
-# UPDATE SOURCE FILES
-#=================================================
-
-# Here we use the $assets variable to get the resources published in the upstream release.
-# Here is an example for Grav, it has to be adapted in accordance with how the upstream releases look like.
-
-# Let's loop over the array of assets URLs
-for asset_url in ${assets[@]}; do
-
-echo "Handling asset at $asset_url"
-
-# Assign the asset to a source file in conf/ directory
-# Leave $src empty to ignore the asset
-#case $asset_url in
-#  *"Source"*)
-#    src="app"
-#    ;;
-#  *)
-#    src=""
-#    ;;
-#esac
-#There should be only one asset in the zipball directory and it is a zip file
-src="app"
-extension="zip"
-# If $src is not empty, let's process the asset
-if [ ! -z "$src" ]; then
-
-# Create the temporary directory
-tempdir="$(mktemp -d)"
-
-# Download sources and calculate checksum
-filename=${asset_url##*/}
-curl --silent -4 -L $asset_url -o "$tempdir/$filename"
-checksum=$(sha256sum "$tempdir/$filename" | head -c 64)
-
-# Delete temporary directory
-rm -rf $tempdir
-
-# Get extension
-#if [[ $filename == *.tar.gz ]]; then
-#  extension=tar.gz
-#else
-#  extension=${filename##*.}
-#fi
-
-# Rewrite source file
-cat <<EOT > conf/$src.src
-SOURCE_URL=$asset_url
-SOURCE_SUM=$checksum
-SOURCE_SUM_PRG=sha256sum
-SOURCE_FORMAT=$extension
-SOURCE_IN_SUBDIR=true
-SOURCE_EXTRACT=true
-EOT
-echo "... conf/$src.src updated"
-
-else
-echo "... asset ignored"
-fi
-
-done
-
-#=================================================
-# SPECIFIC UPDATE STEPS
-#=================================================
-
-# Any action on the app's source code can be done.
-# The GitHub Action workflow takes care of committing all changes after this script ends.
-
-#=================================================
-# GENERIC FINALIZATION
-#=================================================
-
-# Replace new version in manifest
-sed -i "s/^version\s*=.*/version = \"$version~ynh1\"/" manifest.toml
-
-# No need to update the README, yunohost-bot takes care of it
-#remove the venv folder
-rm -rf ./venv
-# The Action will proceed only if the PROCEED environment variable is set to true
-echo "PROCEED=true" >> $GITHUB_ENV
-exit 0
diff --git a/.github/workflows/updater.yml b/.github/workflows/updater.yml
deleted file mode 100644
index 4a866ff..0000000
--- a/.github/workflows/updater.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-# This workflow allows GitHub Actions to automagically update your app whenever a new upstream release is detected.
-# You need to enable Actions in your repository settings, and fetch this Action from the YunoHost-Apps organization.
-# This file should be enough by itself, but feel free to tune it to your needs.
-# It calls updater.sh, which is where you should put the app-specific update steps.
-name: Check for new upstream releases
-on:
-  # Allow to manually trigger the workflow
-  workflow_dispatch:
-  # Run it every day at 6:00 UTC
-  schedule:
-    - cron:  '0 6 * * *'
-jobs:
-  updater:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Fetch the source code
-        uses: actions/checkout@v3
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-      - name: Run the updater script
-        id: run_updater
-        run: |
-          # Setting up Git user
-          git config --global user.name 'yunohost-bot'
-          git config --global user.email 'yunohost-bot@users.noreply.github.com'
-          # Run the updater script
-          /bin/bash .github/workflows/updater.sh
-      - name: Commit changes
-        id: commit
-        if: ${{ env.PROCEED == 'true' }}
-        run: |
-          git commit -am "Upgrade to v$VERSION"
-      - name: Create Pull Request
-        id: cpr
-        if: ${{ env.PROCEED == 'true' }}
-        uses: peter-evans/create-pull-request@v4
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          commit-message: Update to version ${{ env.VERSION }}
-          committer: 'yunohost-bot <yunohost-bot@users.noreply.github.com>'
-          author: 'yunohost-bot <yunohost-bot@users.noreply.github.com>'
-          signoff: false
-          base: testing
-          branch: ci-auto-update-v${{ env.VERSION }}
-          delete-branch: true
-          title: 'Upgrade to version ${{ env.VERSION }}'
-          body: |
-            Upgrade to v${{ env.VERSION }}
-            [See upstream release page](https://github.com/${{ env.REPO }}/releases/tag/v${{ env.VERSION }})
-          draft: false

From 278d925c19ef45c6691f66167875a8497833dfdb Mon Sep 17 00:00:00 2001
From: Krakinou <misterl56@hotmail.com>
Date: Sun, 7 May 2023 15:31:49 +0200
Subject: [PATCH 7/9] remove git info

---
 manifest.toml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/manifest.toml b/manifest.toml
index 9036f89..d33b272 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -5,11 +5,7 @@ name = "Zwave-JS-UI"
 description.en = "Full featured Z-Wave Control Panel and MQTT Gateway integrated with domoticz"
 description.fr = "Panneau de controle Z-Wave et MQTT intégré avec Domoticz"
 
-<<<<<<< HEAD
 version = "8.15.0~ynh2"
-=======
-version = "8.15.0~ynh1"
->>>>>>> refs/remotes/origin/testing
 
 maintainers = ["Krakinou"]
 

From 38f219a461c56f1ca5778e6bbac8c4d31ddc130c Mon Sep 17 00:00:00 2001
From: yunohost-bot <yunohost@yunohost.org>
Date: Sun, 7 May 2023 13:31:54 +0000
Subject: [PATCH 8/9] Auto-update README

---
 README.md    | 5 -----
 README_fr.md | 4 ----
 2 files changed, 9 deletions(-)

diff --git a/README.md b/README.md
index c5a54b1..9db4fbd 100644
--- a/README.md
+++ b/README.md
@@ -32,12 +32,7 @@ For now, although the package is fully functional (install, remove, backup, rest
 
 
 
-<<<<<<< HEAD
 **Shipped version:** 8.15.0~ynh2
-=======
-
-**Shipped version:** 8.15.0~ynh1
->>>>>>> refs/remotes/origin/testing
 ## Documentation and resources
 
 * Official app website: <https://zwave-js.github.io/zwave-js-ui/#/>
diff --git a/README_fr.md b/README_fr.md
index a3ffd75..aef8f66 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -31,11 +31,7 @@ Pour fonctionner correctement, cette application nécessite d'avoir installé so
 Pour l'instant, bien que le package fonctionne (installation, désinstallation, sauvegarde, restauration...), il n'est pas intégré avec domoticz et mosquitto, les paramétrages doivent être fait manuellement depuis l'application.
 
 
-<<<<<<< HEAD
 **Version incluse :** 8.15.0~ynh2
-=======
-**Version incluse :** 8.15.0~ynh1
->>>>>>> refs/remotes/origin/testing
 ## Documentations et ressources
 
 * Site officiel de l’app : <https://zwave-js.github.io/zwave-js-ui/#/>

From 4b8b7f90b25a67cd370052f111d6d799ec5fd25d Mon Sep 17 00:00:00 2001
From: Krakinou <misterl56@hotmail.com>
Date: Sun, 7 May 2023 15:35:59 +0200
Subject: [PATCH 9/9] move exec file name to common

---
 scripts/_common.sh | 7 ++++++-
 scripts/install    | 7 -------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index 69c72c9..2d75279 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -3,7 +3,12 @@
 #=================================================
 # COMMON VARIABLES
 #=================================================
-
+if [[ "$YNH_ARCH" == "armhf" ]] || [[ "$YNH_ARCH" == "arm64" ]]
+then
+    file_exec="zwave-js-ui"
+else
+    file_exec="zwave-js-ui-linux"
+fi
 #=================================================
 # PERSONAL HELPERS
 #=================================================
diff --git a/scripts/install b/scripts/install
index ac957fd..b54bb16 100755
--- a/scripts/install
+++ b/scripts/install
@@ -9,13 +9,6 @@
 source _common.sh
 source /usr/share/yunohost/helpers
 
-
-if [[ "$YNH_ARCH" == "armhf" ]] || [[ "$YNH_ARCH" == "arm64" ]]
-then
-    file_exec="zwave-js-ui"
-else
-    file_exec="zwave-js-ui-linux"
-fi
 #=================================================
 # ADD SWAP IF NEEDED
 #=================================================