From 1075b6c7ab2dffa2b30cbd80452f5f15661f7993 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Wed, 2 Dec 2020 12:56:47 +0100
Subject: [PATCH] Testing (#19)

* Fix linter warning
---
 check_process   |  2 --
 manifest.json   |  2 +-
 scripts/backup  |  1 -
 scripts/install |  4 ++--
 scripts/restore |  4 ++--
 scripts/upgrade | 15 ++++-----------
 6 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/check_process b/check_process
index b57d1c3..ae3a979 100644
--- a/check_process
+++ b/check_process
@@ -25,8 +25,6 @@
 		incorrect_path=1
 		port_already_use=1
 		change_url=0
-;;; Levels
-	Level 5=auto
 ;;; Options
 Email=
 Notification=none
diff --git a/manifest.json b/manifest.json
index af8ab8c..cec3fb8 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Web-based cross-platform XMPP client",
         "fr": "Client XMPP multiplateforme basé sur le Web"
     },
-    "version": "0.18~ynh3",
+    "version": "0.18~ynh4",
     "url": "https://movim.eu",
     "license": "AGPL-3.0-or-later",
     "maintainer": {
diff --git a/scripts/backup b/scripts/backup
index 45a26b8..947603f 100644
--- a/scripts/backup
+++ b/scripts/backup
@@ -49,7 +49,6 @@ ynh_backup --src_path="$final_path"
 
 ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 
-
 #=================================================
 # BACKUP THE PHP-FPM CONFIGURATION
 #=================================================
diff --git a/scripts/install b/scripts/install
index 7b853e7..99ecf5c 100644
--- a/scripts/install
+++ b/scripts/install
@@ -169,8 +169,8 @@ mkdir -p $cache_dir
 chown -R $app $cache_dir
 
 cd "$final_path"
-ynh_exec_as $app php"${phpversion}" composer.phar $app:migrate
-php"${phpversion}" daemon.php config --username=$admin --password=$password
+ynh_exec_as $app php$phpversion composer.phar $app:migrate
+ynh_exec_as $app php$phpversion daemon.php config --username=$admin --password=$password
 
 #=================================================
 # GENERIC FINALIZATION
diff --git a/scripts/restore b/scripts/restore
index 71f1eab..00ef06f 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -107,13 +107,13 @@ ynh_psql_execute_file_as_root --file="./db.sql" --database=$db_name
 ynh_script_progression --message="Restoring the systemd configuration..." --weight=4
 
 ynh_restore_file --origin_path="/etc/systemd/system/$app.service"
-systemctl enable $app.service
+systemctl enable $app.service --quiet
 
 #=================================================
 # INTEGRATE SERVICE IN YUNOHOST
 #=================================================
 
-yunohost service add $app --description "Responsive web-based XMPP client" --log "/var/log/$app/$app.log"
+yunohost service add $app --description "Responsive web-based XMPP client" --log="/var/log/$app/$app.log"
 
 #=================================================
 # START SYSTEMD SERVICE
diff --git a/scripts/upgrade b/scripts/upgrade
index 0001056..8225b90 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -73,13 +73,6 @@ ynh_clean_setup () {
 # Exit if an error occurs during the execution of the script
 ynh_abort_if_errors
 
-#=================================================
-# CHECK THE PATH
-#=================================================
-
-# Normalize the URL path syntax
-path_url=$(ynh_normalize_url_path $path_url)
-
 #=================================================
 # STANDARD UPGRADE STEPS
 #=================================================
@@ -155,9 +148,9 @@ yunohost service add $app --description "Responsive web-based XMPP client" --log
 
 (
 	cd "$final_path"
-	curl -sS https://getcomposer.org/installer | php${phpversion} -- --version="1.10.16" --install-dir="$final_path" \
-		&& php${phpversion} composer.phar config --global discard-changes true --quiet \
-		&& php${phpversion} composer.phar install --no-interaction --quiet
+	curl -sS https://getcomposer.org/installer | php$phpversion -- --version="1.10.16" --install-dir="$final_path" \
+		&& php$phpversion composer.phar config --global discard-changes true --quiet \
+		&& php$phpversion composer.phar install --no-interaction --quiet
 )
 
 #=================================================
@@ -166,7 +159,7 @@ yunohost service add $app --description "Responsive web-based XMPP client" --log
 ynh_script_progression --message="Configuring database.." --weight=1
 (
 	cd "$final_path"
-	ynh_exec_as $app php${phpversion} composer.phar movim:migrate
+	ynh_exec_as $app php$phpversion composer.phar movim:migrate
 )
 
 #=================================================