Merge pull request #19 from YunoHost-Apps/upgrade-4.1.0-fixed

Fix ARM and upgrade to 4.1.0

README.md

@@ -17,7 +17,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to
 - **Responsive interface.** The client works smoothly on every desktop, smartphone and tablet.
 - **Synchronized experience.** Always resume where you left off no matter what device.
 
-**Shipped version:** 3.3.0
+**Shipped version:** 4.1.0
 
 ## Screenshots
 

conf/app.src

@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/thelounge/thelounge/archive/v3.3.0.tar.gz
-SOURCE_SUM=38cb3e14e106d86fc953686edec5e6c30a09a9945e2987e0579c8b78af2666c0
+SOURCE_URL=https://github.com/thelounge/thelounge/archive/v4.1.0.tar.gz
+SOURCE_SUM=f1761b134b10699ccc13d31258c41745681ccd620e0a1a91247d54910229db71
 SOURCE_SUM_PRG=sha256sum
 ARCH_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true

conf/systemd.service

@@ -9,7 +9,7 @@ Group=__APP__
 WorkingDirectory=__FINALPATH__
 Environment="PATH=__ENV_PATH__"
 Environment="THELOUNGE_HOME=/home/yunohost.app/__APP__/"
-ExecStart=__NODE__/node index.js start
+ExecStart=__NODE__/node index.js start > /var/log/$app/$app.log
 Restart=always
 
 [Install]

manifest.json

@@ -6,7 +6,7 @@
         "en": "The Lounge is a web IRC client.",
         "fr": "The Lounge est un client web IRC."
     },
-    "version": "3.3.0~ynh1",
+    "version": "4.1.0~ynh1",
     "url": "https://thelounge.chat/",
     "license": "MIT",
     "maintainer": {

scripts/install

@@ -13,6 +13,10 @@ source /usr/share/yunohost/helpers
 # MANAGE SCRIPT FAILURE
 #=================================================
 
+ynh_clean_setup () {
+ynh_clean_check_starting
+}
+
 # Exit if an error occurs during the execution of the script
 ynh_abort_if_errors
 
@@ -190,7 +194,7 @@ ynh_script_progression --message="Starting a systemd service..."
 ###		- And the section "STOP SYSTEMD SERVICE" and "START SYSTEMD SERVICE" in the change_url script
 
 # Start a systemd service
-ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log"
+ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" --line_match="[INFO] Available at http://:::9000/ in private mode"
 
 #=================================================
 # SETUP SSOWAT

scripts/restore

@@ -13,6 +13,10 @@ source /usr/share/yunohost/helpers
 # MANAGE SCRIPT FAILURE
 #=================================================
 
+ynh_clean_setup () {
+ynh_clean_check_starting
+}
+
 # Exit if an error occurs during the execution of the script
 ynh_abort_if_errors
 
@@ -96,7 +100,7 @@ yunohost service add $app --log "/var/log/$app/$app.log"
 #=================================================
 ynh_script_progression --message="Starting a systemd service..." --time --weight=1
 
-ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log"
+ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" --line_match="[INFO] Available at http://:::9000/ in private mode"
 
 #=================================================
 # RESTORE THE LOGROTATE CONFIGURATION

scripts/upgrade

@@ -70,6 +70,7 @@ ynh_script_progression --message="Backing up the app before upgrading (may take
 # Backup the current version of the app
 ynh_backup_before_upgrade
 ynh_clean_setup () {
+	ynh_clean_check_starting
 	# restore it if the upgrade fails
 	ynh_restore_upgradebackup
 }
@@ -220,7 +221,7 @@ fi
 #=================================================
 ynh_script_progression --message="Starting a systemd service..." --time --weight=1
 
-ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log"
+ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" --line_match="[INFO] Available at http://:::9000/ in private mode"
 
 #=================================================
 # RELOAD NGINX