From a5ea0ad42851a9cb1a2e29d4bea193ef4564d0a1 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Mon, 4 Jan 2021 13:17:33 +0100
Subject: [PATCH] Fix linter warning

---
 manifest.json   | 43 +++++++++++++++++++++++--------------------
 scripts/restore |  4 ++--
 scripts/upgrade |  4 ++--
 3 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/manifest.json b/manifest.json
index cd2c274..dc1b023 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,6 +6,7 @@
         "en": "Low-latency, high quality voice chat software (VoIP).",
         "fr": "Logiciel libre de voix sur IP (VoIP)."
     },
+    "version": "1.2.8~ynh7",
     "url": "https://mumble.info",
     "license": "BSD-3-Clause",
     "maintainer": {
@@ -13,39 +14,41 @@
         "email": "jean-baptiste@holcroft.fr"
     },
     "requirements": {
-        "yunohost": ">= 3.4.0"
+        "yunohost": ">= 3.8.1"
     },
-    "version": "1.2.8~ynh7",
     "multi_instance": true,
     "services": [
     ],
     "arguments": {
         "install" : [
 	   {
-    	        "name": "domain",
-	        "type": "domain",
-	        "ask": {
-                    "en": "Choose a domain (used to select the correct certificate)"
+            "name": "domain",
+            "type": "domain",
+            "ask": {
+                "en": "Choose a domain (used to select the correct certificate)",
+                "fr": "Choisissez un domaine (utilisé pour sélectionner le bon certificat)"
 	        },
 	        "example": "domain.org"
 	    },
             {
-                "name": "welcometext",
-                "ask": {
-                    "en": "Choose a welcome text for your server",
-                    "fr": "Choisissez un message de bienvenue pour le serveur"
-                },
-                "example": "Welcome to my mumble server",
-                "default": "Welcome"
+            "name": "welcometext",
+            "type": "string",
+            "ask": {
+                "en": "Choose a welcome text for your server",
+                "fr": "Choisissez un message de bienvenue pour le serveur"
+            },
+            "example": "Welcome to my Mumble server",
+            "default": "Welcome"
             },
             {
-                "name": "registername",
-                "ask": {
-                    "en": "Choose a name for the root channel (your mumble server name)",
-                    "fr": "Entrez un nom pour le channel racine (le nom de votre serveur mumble)"
-                },
-                "example": "Root",
-                "default": "Root"
+            "name": "registername",
+            "type": "string",
+            "ask": {
+                "en": "Choose a name for the root channel (your Mumble server name)",
+                "fr": "Entrez un nom pour le channel racine (le nom de votre serveur Mumble)"
+            },
+            "example": "Root",
+            "default": "Root"
             }
         ]
     }
diff --git a/scripts/restore b/scripts/restore
index 1baf0a0..099e705 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -66,14 +66,14 @@ usermod --append --groups ssl-cert mumble-server
 #=================================================
 
 systemctl stop mumble-server
-systemctl disable mumble-server
+systemctl disable mumble-server --quiet
 
 #=================================================
 # ADVERTISE SERVICE IN ADMIN PANEL
 #=================================================
 
 # Add Mumble as a YunoHost service
-yunohost service add "$app" -l "/var/log/mumble-server/$app.log"
+yunohost service add $app --description="Mumble server" --log="/var/log/$app/$app.log"
 
 #=================================================
 # RESTORE SYSTEMD
diff --git a/scripts/upgrade b/scripts/upgrade
index aba523a..dc094e3 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -74,7 +74,7 @@ if [ -z "$server_password" ]; then
 	systemctl stop mumble-server
 	dpkg-reconfigure mumble-server --frontend=Noninteractive
 	systemctl stop mumble-server
-	systemctl disable mumble-server
+	systemctl disable mumble-server --quiet
 fi
 
 # Fix SSO issue
@@ -193,7 +193,7 @@ systemctl disable mumble-server --quiet
 #=================================================
 
 # Add Mumble as a YunoHost service
-yunohost service add "$app" -l "/var/log/mumble-server/$app.log"
+yunohost service add $app --description="Mumble server" --log="/var/log/$app/$app.log"
 
 systemctl restart "$app"