From 575bb90d25df932b72c7093ff87840a21fc9994a Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Mon, 14 Dec 2020 10:15:40 +0100
Subject: [PATCH] Fix linter warnings

---
 check_process   |  2 --
 manifest.json   |  2 +-
 scripts/install |  4 ++--
 scripts/restore |  2 +-
 scripts/upgrade | 10 +++++-----
 5 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/check_process b/check_process
index 8e2f879..7d6d5cf 100644
--- a/check_process
+++ b/check_process
@@ -16,8 +16,6 @@
 		multi_instance=1
 		port_already_use=1
 		change_url=1
-;;; Levels
-	Level 5=auto
 ;;; Options
 Email=
 Notification=none
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 4916eed..23d4e73 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Collaborative editor to work on notes written in Markdown",
         "fr": "Éditeur collaboratif pour travailler sur des notes en Markdown"
     },
-    "version": "1.6.0~ynh5",
+    "version": "1.6.0~ynh6",
     "url": "https://github.com/codimd/server",
     "license": "AGPL-3.0-only",
     "maintainer": {
diff --git a/scripts/install b/scripts/install
index 919d41a..228bfed 100644
--- a/scripts/install
+++ b/scripts/install
@@ -118,7 +118,7 @@ ynh_system_user_create --username=$app --home_dir=$final_path
 #==============================================
 # INSTALL CODIMD
 #==============================================
-ynh_script_progression --message="Building CodiMD... (this will take some time and resources!)" --weight=240
+ynh_script_progression --message="Building CodiMD... (this will take some time and resources!)" --weight=24
 
 pushd "$final_path" || ynh_die
 
@@ -200,7 +200,7 @@ if [ $is_public -eq 1 ]
 then
 	# Everyone can access the app.
 	# The "main" permission is automatically created before the install script.
-	 	ynh_permission_update --permission "main" --add "visitors"
+	ynh_permission_update --permission "main" --add "visitors"
 fi
 
 #=================================================
diff --git a/scripts/restore b/scripts/restore
index cd658be..d8baec6 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -106,7 +106,7 @@ ynh_psql_execute_file_as_root --file="./db.sql" --database=$db_name
 ynh_script_progression --message="Restoring the systemd configuration..." --weight=5
 
 ynh_restore_file --origin_path="/etc/systemd/system/$app.service"
-systemctl enable $app.service
+systemctl enable $app.service --quiet
 
 #=================================================
 # INTEGRATE SERVICE IN YUNOHOST
diff --git a/scripts/upgrade b/scripts/upgrade
index dd105ec..fb1801e 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -36,7 +36,7 @@ upgrade_type=$(ynh_check_app_version_changed)
 #=================================================
 # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
 #=================================================
-ynh_script_progression --message="Backing up CodiMD before upgrading (may take a while)..." --weight=120
+ynh_script_progression --message="Backing up CodiMD before upgrading (may take a while)..." --weight=20
 
 # Backup the current version of the app
 ynh_backup_before_upgrade
@@ -62,7 +62,7 @@ ynh_systemd_action --service_name=$app --action="stop" --log_path="systemd"
 
 if [ "$upgrade_type" == "UPGRADE_APP" ]
 then
-	ynh_script_progression --message="Upgrading source files..." --weight=160
+	ynh_script_progression --message="Upgrading source files..." --weight=16
 
 	# Create a temporary directory
 	tmpdir="$(mktemp -d)"
@@ -121,7 +121,7 @@ ynh_system_user_create --username=$app
 #==============================================
 if [ "$upgrade_type" == "UPGRADE_APP" ]
 then
-	ynh_script_progression --message="Building CodiMD... (this will take some time and resources!)" --weight=160
+	ynh_script_progression --message="Building CodiMD... (this will take some time and resources!)" --weight=16
 
 	pushd "$final_path" || ynh_die
 
@@ -169,7 +169,7 @@ ynh_add_systemd_config
 #=================================================
 # SECURE FILES AND DIRECTORIES
 #=================================================
-ynh_script_progression --message="Securing files and directories..."
+ynh_script_progression --message="Securing files and directories..." --weight=1
 
 # Set permissions on app files
 chown -R $app:$app $final_path
@@ -177,7 +177,7 @@ chown -R $app:$app $final_path
 #=================================================
 # INTEGRATE SERVICE IN YUNOHOST
 #=================================================
-ynh_script_progression --message="Integrating service in YunoHost..."
+ynh_script_progression --message="Integrating service in YunoHost..." --weight=2
 
 yunohost service add $app --description "Collaborative Markdown notes" --log="/var/log/$app/$app.log"