From 84e8fbe621af59f724bb0942321a38589ff9e8aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josu=C3=A9=20Tille?= <josue@tille.ch>
Date: Mon, 24 Oct 2022 11:05:10 +0200
Subject: [PATCH] Fix linter and upgrade to 3.14

---
 conf/app.src    |  4 ++--
 manifest.json   | 10 +---------
 scripts/install |  2 --
 scripts/remove  |  3 ---
 scripts/restore |  3 ---
 5 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/conf/app.src b/conf/app.src
index ab6a467..7385f96 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,5 +1,5 @@
-SOURCE_URL=http://www.monitorix.org/monitorix_3.13.1-izzy1_all.deb
-SOURCE_SUM=17a48021c46bf5656caeacbcf2da6bff63816496bf1d4f4926daa64c76a4733f
+SOURCE_URL=http://www.monitorix.org/monitorix_3.14.0-izzy1_all.deb
+SOURCE_SUM=b05e776f425a8b8873c8851b7e1861cefe23e512
 # (Optional) Program to check the integrity (sha256sum, md5sum...)
 # default: sha256
 SOURCE_SUM_PRG=sha256sum
diff --git a/manifest.json b/manifest.json
index 4fea4b1..dc396d1 100644
--- a/manifest.json
+++ b/manifest.json
@@ -14,7 +14,7 @@
         "email": "josue@familletille.ch"
     },
     "requirements": {
-		"yunohost": ">= 3.5.2.2"
+		"yunohost": ">= 4.1.2"
     },
     "multi_instance": false,
     "services": [
@@ -26,19 +26,11 @@
             {
                 "name": "domain",
                 "type": "domain",
-                "ask": {
-                    "en": "Choose a domain name for Monitorix",
-                    "fr": "Choisissez un nom de domaine pour Monitorix"
-                },
                 "example": "example.com"
             },
             {
                 "name": "path",
                 "type": "path",
-                "ask": {
-                    "en": "Choose a path for Monitorix",
-                    "fr": "Choisissez un chemin pour Monitorix"
-                },
                 "example": "/monitorix",
                 "default": "/monitorix"
             }
diff --git a/scripts/install b/scripts/install
index a5ed917..2b8f34f 100755
--- a/scripts/install
+++ b/scripts/install
@@ -20,8 +20,6 @@ ynh_script_progression --message="Validating installation parameters..."
 domain=$YNH_APP_ARG_DOMAIN
 path_url=$YNH_APP_ARG_PATH
 
-# Check domain/path availability
-test $(ynh_webpath_available --domain $domain --path_url $path_url) == 'True' || ynh_die --message "$domain$path_url is not available, please use an other domain or path."
 ynh_webpath_register $app $domain $path_url
 
 # Find a port for built-in monitorix HTTP server
diff --git a/scripts/remove b/scripts/remove
index 3655351..dcf1a32 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -4,9 +4,6 @@
 # GENERIC START
 #=================================================
 
-# Stop script if errors
-set -u
-
 # Import common cmd
 source ./experimental_helper.sh
 source ./_common.sh
diff --git a/scripts/restore b/scripts/restore
index f679785..cf77fc9 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -20,9 +20,6 @@ ynh_script_progression --message="Loading settings..."
 domain=$(ynh_app_setting_get --app $app --key domain)
 path_url=$(ynh_normalize_url_path --path_url $(ynh_app_setting_get --app $app --key path))
 
-# Check domain/path availability
-ynh_webpath_available --domain $domain --path_url $path_url || ynh_die --message "$domain/$path_url is not available, please use an other domain or path."
-
 #=================================================
 # STANDARD RESTORATION STEPS
 #=================================================