From 050caba4f20d399a416428497bac884cc30a7d47 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Mon, 14 Dec 2020 10:59:22 +0100
Subject: [PATCH] Fix linter warnings

---
 check_process   | 3 ---
 manifest.json   | 6 +++++-
 scripts/install | 4 ++--
 scripts/restore | 5 +++--
 scripts/upgrade | 4 ++--
 5 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/check_process b/check_process
index 32018f8..ccb5ae4 100644
--- a/check_process
+++ b/check_process
@@ -19,11 +19,8 @@
 		upgrade=1
 		backup_restore=1
 		multi_instance=0
-		incorrect_path=0
 		port_already_use=0
 		change_url=0
-;;; Levels
-	Level 5=auto
 ;;; Options
 Email=
 Notification=none
diff --git a/manifest.json b/manifest.json
index a73f7b7..02b2075 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Self hosted streaming media server",
         "fr": "Serveur de streaming auto-hébergé"
     },
-    "version": "1.9.2~ynh1",
+    "version": "1.9.2~ynh2",
     "url": "https://streamaserver.org/",
     "license": "MIT",
     "maintainer": {
@@ -38,6 +38,10 @@
                     "en": "Is it a public site?",
                     "fr": "Est-ce un site public ?"
                 },
+                "help": {
+                    "en": "If enabled, Streama will be accessible by people who do not have an account. This can be changed later via the webadmin.",
+                    "fr": "Si cette case est cochée, Streama sera accessible aux personnes n’ayant pas de compte. Vous pourrez changer ceci plus tard via la webadmin."
+                },
                 "default": true
             }
         ]
diff --git a/scripts/install b/scripts/install
index d6ec054..468447c 100644
--- a/scripts/install
+++ b/scripts/install
@@ -123,9 +123,9 @@ chmod +x $final_path/streama.jar
 #=================================================
 # INTEGRATE SERVICE IN YUNOHOST
 #=================================================
-ynh_script_progression --message="Integrating service in YunoHost..." --weight=4
+ynh_script_progression --message="Integrating service in YunoHost..." --weight=3
 
-yunohost service add $app --description "Streama media system" --log "/var/log/$app/$app.log"
+yunohost service add $app --description="Streama media system" --log="/var/log/$app/$app.log"
 
 #=================================================
 # START SYSTEMD SERVICE
diff --git a/scripts/restore b/scripts/restore
index 78c6481..f52eb04 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -78,13 +78,14 @@ ynh_install_app_dependencies $pkg_dependencies
 ynh_script_progression --message="Restoring the systemd configuration..." --weight=2
 
 ynh_restore_file --origin_path="/etc/systemd/system/$app.service"
-systemctl enable $app.service
+systemctl enable $app.service --quiet
 
 #=================================================
 # INTEGRATE SERVICE IN YUNOHOST
 #=================================================
+ynh_script_progression --message="Integrating service in YunoHost..." --weight=3
 
-yunohost service add "$app" --description "Streama media system" --log "/var/log/$app/$app.log"
+yunohost service add $app --description="Streama media system" --log="/var/log/$app/$app.log"
 
 #=================================================
 # START SYSTEMD SERVICE
diff --git a/scripts/upgrade b/scripts/upgrade
index 8a36150..c47b32a 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -58,7 +58,7 @@ ynh_setup_source --dest_dir="$final_path"
 #=================================================
 # NGINX CONFIGURATION
 #=================================================
-ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=240
+ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=24
 
 # Create a dedicated NGINX config
 ynh_add_nginx_config
@@ -105,7 +105,7 @@ chmod +x $final_path/streama.jar
 #=================================================
 ynh_script_progression --message="Integrating service in YunoHost..." --weight=3
 
-yunohost service add $app --description "Streama media system" --log "/var/log/$app/$app.log"
+yunohost service add $app --description="Streama media system" --log="/var/log/$app/$app.log"
 
 #=================================================
 # START SYSTEMD SERVICE