From 93c9965e2e13416dda824e54fad876ccf2ea809b Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Holcroft Date: Thu, 28 Dec 2017 08:33:46 +0100 Subject: [PATCH] Fix package linter --- manifest.json | 6 +++--- scripts/_common.sh | 1 + scripts/backup | 26 +++++++++++++------------- scripts/install | 2 +- scripts/remove | 2 +- scripts/restore | 26 +++++++++++++------------- scripts/upgrade | 2 +- 7 files changed, 33 insertions(+), 32 deletions(-) create mode 100644 scripts/_common.sh diff --git a/manifest.json b/manifest.json index 724e7a5..bc8a31e 100644 --- a/manifest.json +++ b/manifest.json @@ -6,15 +6,15 @@ "en": "A PHP and Ajax feed reader", "fr": "Un lecteur de flux en PHP et Ajax" }, - "url": "http://tt-rss.org", - "license": "GPL-3", + "url": "https://tt-rss.org", + "license": "GPL-3.0", "version": "153cb6d30510f9804fe596ac6777bc2f35111ae2", "maintainer": { "name": "titoko", "email": "titoko@titoko.fr" }, "requirements": { - "yunohost": ">= 2.6.4" + "yunohost": ">= 2.7.0" }, "multi_instance": true, "services": [ diff --git a/scripts/_common.sh b/scripts/_common.sh new file mode 100644 index 0000000..a9bf588 --- /dev/null +++ b/scripts/_common.sh @@ -0,0 +1 @@ +#!/bin/bash diff --git a/scripts/backup b/scripts/backup index a3ef46e..1506eb9 100644 --- a/scripts/backup +++ b/scripts/backup @@ -2,25 +2,25 @@ #================================================= # GENERIC START -#================================================= -# MANAGE SCRIPT FAILURE -#================================================= - -# Exit on command errors and treat access to unset variables as an error -set -eu - #================================================= # IMPORT GENERIC HELPERS #================================================= -# if [ ! -e _common.sh ]; then -# # Get the _common.sh file if it's not in the current directory -# cp ../settings/scripts/_common.sh ./_common.sh -# chmod a+rx _common.sh -# fi -# source _common.sh +if [ ! -e _common.sh ]; then + # Get the _common.sh file if it's not in the current directory + cp ../settings/scripts/_common.sh ./_common.sh + chmod a+rx _common.sh +fi +source _common.sh source /usr/share/yunohost/helpers +#================================================= +# MANAGE SCRIPT FAILURE +#================================================= + +# Exit if an error occurs during the execution of the script +ynh_abort_if_errors + #================================================= # LOAD SETTINGS #================================================= diff --git a/scripts/install b/scripts/install index 3fc564f..74db7a4 100644 --- a/scripts/install +++ b/scripts/install @@ -6,7 +6,7 @@ # IMPORT GENERIC HELPERS #================================================= -# source _common.sh +source _common.sh source /usr/share/yunohost/helpers #================================================= diff --git a/scripts/remove b/scripts/remove index a09e254..fe5d506 100644 --- a/scripts/remove +++ b/scripts/remove @@ -6,7 +6,7 @@ # IMPORT GENERIC HELPERS #================================================= -# source _common.sh +source _common.sh source /usr/share/yunohost/helpers #================================================= diff --git a/scripts/restore b/scripts/restore index b4d7ca0..27d1608 100644 --- a/scripts/restore +++ b/scripts/restore @@ -2,25 +2,25 @@ #================================================= # GENERIC START -#================================================= -# MANAGE SCRIPT FAILURE -#================================================= - -# Exit on command errors and treat access to unset variables as an error -set -eu - #================================================= # IMPORT GENERIC HELPERS #================================================= -# if [ ! -e _common.sh ]; then -# # Get the _common.sh file if it's not in the current directory -# cp ../settings/scripts/_common.sh ./_common.sh -# chmod a+rx _common.sh -# fi -# source _common.sh +if [ ! -e _common.sh ]; then + # Get the _common.sh file if it's not in the current directory + cp ../settings/scripts/_common.sh ./_common.sh + chmod a+rx _common.sh +fi +source _common.sh source /usr/share/yunohost/helpers +#================================================= +# MANAGE SCRIPT FAILURE +#================================================= + +# Exit if an error occurs during the execution of the script +ynh_abort_if_errors + #================================================= # LOAD SETTINGS #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 13a97b8..f807dd6 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -6,7 +6,7 @@ # IMPORT GENERIC HELPERS #================================================= -# source _common.sh +source _common.sh source /usr/share/yunohost/helpers #=================================================