From f4595f1846411156f56e1608bcd91d1222525c80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josu=C3=A9=20Tille?= <josue@tille.ch>
Date: Tue, 17 Nov 2020 23:55:57 +0100
Subject: [PATCH] Fix package linter

---
 check_process      | 13 -------------
 manifest.json      |  4 ++--
 scripts/backup     |  8 ++++----
 scripts/change_url |  8 ++++----
 scripts/install    |  8 ++++----
 scripts/remove     |  6 +++---
 scripts/restore    |  8 ++++----
 scripts/upgrade    |  8 ++++----
 8 files changed, 25 insertions(+), 38 deletions(-)

diff --git a/check_process b/check_process
index 40fdc6d..2270510 100644
--- a/check_process
+++ b/check_process
@@ -25,19 +25,6 @@
         incorrect_path=1
         port_already_use=1 (8448)
         change_url=0
-;;; Levels
-    Level 1=auto
-    Level 2=auto
-    Level 3=auto
-    # https://github.com/YunoHost-Apps/sogo_ynh/blob/master/conf/sogo.conf#L25-L40
-    Level 4=1
-    Level 5=auto
-    Level 5=auto
-    Level 6=auto
-    Level 7=auto
-    Level 8=0
-    Level 9=0
-    Level 10=0
 ;;; Upgrade options
     ; commit=b2595379b2e4f3f0d7ad1ae7da4f90a8184a90ff
         name=Branch_Old_package_For_CI1
diff --git a/manifest.json b/manifest.json
index b3f0629..de23767 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,8 +6,8 @@
     "url": "https://sogo.nu/",
     "version": "4.0.7-1~ynh1",
     "description": {
-        "en": "Sogo is an opensource groupware for E-Mail, Contacts and Calender.",
-        "fr": "Sogo est un groupware opensource pour les e-mail, contacts et calendrier" 
+        "en": "An opensource groupware for E-Mail, Contacts and Calender.",
+        "fr": "Un groupware opensource pour les e-mail, contacts et calendrier" 
     },
     "maintainer": {
         "name": "Josué Tille",
diff --git a/scripts/backup b/scripts/backup
index 1b495c8..6f43c22 100755
--- a/scripts/backup
+++ b/scripts/backup
@@ -4,16 +4,16 @@
 # GENERIC START
 #=================================================
 
+# Import common cmd
+source ../settings/scripts/experimental_helper.sh
+source ../settings/scripts/_common.sh
+
 # Source YunoHost helpers
 source /usr/share/yunohost/helpers
 
 # Stop script if errors
 ynh_abort_if_errors
 
-# Import common cmd
-source ../settings/scripts/experimental_helper.sh
-source ../settings/scripts/_common.sh
-
 ynh_script_progression --message="Loading installation settings..."
 
 # retrieve useful param
diff --git a/scripts/change_url b/scripts/change_url
index c5f174f..1813e6b 100644
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -4,16 +4,16 @@
 # GENERIC START
 #=================================================
 
+# Import common cmd
+source ./experimental_helper.sh
+source ./_common.sh
+
 # IMPORT GENERIC HELPERS
 source /usr/share/yunohost/helpers
 
 # Exit if an error occurs during the execution of the script
 ynh_abort_if_errors
 
-# Import common cmd
-source ./experimental_helper.sh
-source ./_common.sh
-
 ynh_script_progression --message="Loading installation settings..."
 
 # RETRIEVE ARGUMENTS
diff --git a/scripts/install b/scripts/install
index f1611d1..0000d36 100755
--- a/scripts/install
+++ b/scripts/install
@@ -4,16 +4,16 @@
 # GENERIC START
 #=================================================
 
+# Import common cmd
+source ./experimental_helper.sh
+source ./_common.sh
+
 # Source YunoHost helpers
 source /usr/share/yunohost/helpers
 
 # Stop script if errors
 ynh_abort_if_errors
 
-# Import common cmd
-source ./experimental_helper.sh
-source ./_common.sh
-
 ynh_script_progression --message="Validating installation parameters..."
 
 # RETRIEVE ARGUMENTS FROM THE MANIFEST
diff --git a/scripts/remove b/scripts/remove
index 29f151e..3fd2cc1 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -4,9 +4,6 @@
 # GENERIC START
 #=================================================
 
-# Source YunoHost helpers
-source /usr/share/yunohost/helpers
-
 # Stop script if errors
 set -u
 
@@ -14,6 +11,9 @@ set -u
 source ./experimental_helper.sh
 source ./_common.sh
 
+# Source YunoHost helpers
+source /usr/share/yunohost/helpers
+
 ynh_script_progression --message="Loading installation settings..."
 
 # Retrieve app settings
diff --git a/scripts/restore b/scripts/restore
index 324d614..c1d373d 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -4,16 +4,16 @@
 # GENERIC START
 #=================================================
 
+# Import common cmd
+source ../settings/scripts/experimental_helper.sh
+source ../settings/scripts/_common.sh
+
 # Source YunoHost helpers
 source /usr/share/yunohost/helpers
 
 # Stop script if errors
 ynh_abort_if_errors
 
-# Import common cmd
-source ../settings/scripts/experimental_helper.sh
-source ../settings/scripts/_common.sh
-
 ynh_script_progression --message="Loading settings..."
 
 domain=$(ynh_app_setting_get --app $app --key domain)
diff --git a/scripts/upgrade b/scripts/upgrade
index 6cb41aa..ef3b0ad 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -4,16 +4,16 @@
 # GENERIC START
 #=================================================
 
+# Import common cmd
+source ./experimental_helper.sh
+source ./_common.sh
+
 # IMPORT GENERIC HELPERS
 source /usr/share/yunohost/helpers
 
 # Exit if an error occurs during the execution of the script
 ynh_abort_if_errors
 
-# Import common cmd
-source ./experimental_helper.sh
-source ./_common.sh
-
 ynh_script_progression --message="Loading installation settings..."
 
 # LOAD SETTINGS