From 7f7d396e07b981dc4e0a0f721f3bc116f04ce55e Mon Sep 17 00:00:00 2001 From: frju365 Date: Tue, 7 Mar 2017 20:22:29 +0100 Subject: [PATCH 1/6] Update check_process --- check_process | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/check_process b/check_process index 31337ff..2e870a8 100644 --- a/check_process +++ b/check_process @@ -15,7 +15,7 @@ upgrade=1 backup_restore=1 multi_instance=0 - wrong_user=1 + wrong_user=0 wrong_path=1 incorrect_path=1 corrupt_source=0 From a8e44dca0ce18a26efdd9ee0cae73dcad8d967ce Mon Sep 17 00:00:00 2001 From: frju365 Date: Tue, 7 Mar 2017 20:23:17 +0100 Subject: [PATCH 2/6] Update upgrade --- scripts/upgrade | 6 ------ 1 file changed, 6 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 23eeee7..221f175 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -12,12 +12,6 @@ path=$(ynh_app_setting_get $app path) name=$(ynh_app_setting_get "$app" name) language=$(ynh_app_setting_get "$app" language) -# Retrieve arguments -domain=$(ynh_app_setting_set "$app" domain) -path=$(ynh_app_setting_set "$app" path) -name=$(ynh_app_setting_set "$app" name) -language=$(ynh_app_setting_set "$app" language) - # Set default values name="${name:-YunoJappix}" language="${language:-en}" From 473e0761895b8c5922e1daa38884fe3e8615db2d Mon Sep 17 00:00:00 2001 From: frju365 Date: Tue, 7 Mar 2017 20:24:48 +0100 Subject: [PATCH 3/6] Update install --- scripts/install | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/install b/scripts/install index 37dcd8d..6053e23 100644 --- a/scripts/install +++ b/scripts/install @@ -6,6 +6,7 @@ # IMPORT GENERIC HELPERS #================================================= +set -eu source .fonctions source /usr/share/yunohost/helpers From ebb6821112451891a708fdab52ef1a6533b25847 Mon Sep 17 00:00:00 2001 From: frju365 Date: Tue, 7 Mar 2017 20:25:11 +0100 Subject: [PATCH 4/6] Update remove --- scripts/remove | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/remove b/scripts/remove index c9400c2..81aaaa8 100644 --- a/scripts/remove +++ b/scripts/remove @@ -1,5 +1,6 @@ #!/bin/bash +set -u source /usr/share/yunohost/helpers app="jappix" From 157eb9a232c326a36be6002ff2b47471ac86e69a Mon Sep 17 00:00:00 2001 From: frju365 Date: Tue, 7 Mar 2017 20:25:50 +0100 Subject: [PATCH 5/6] Update upgrade --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 221f175..a38e177 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -1,6 +1,6 @@ #!/bin/bash -set -e +set -eu source .fonctions source /usr/share/yunohost/helpers From 6a7ec2ac245b8287d63661e5c992adbe29172a38 Mon Sep 17 00:00:00 2001 From: frju365 Date: Tue, 7 Mar 2017 20:26:38 +0100 Subject: [PATCH 6/6] Update backup --- scripts/backup | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/backup b/scripts/backup index de4bc01..696b8fc 100644 --- a/scripts/backup +++ b/scripts/backup @@ -1,7 +1,7 @@ #!/bin/bash # causes the shell to exit if any subcommand or pipeline returns a non-zero status -set -e +set -eu # Source YNH helpers source /usr/share/yunohost/helpers @@ -9,7 +9,7 @@ source /usr/share/yunohost/helpers app="jappix" # Retrieve app settings -domain=$(sudo yunohost app setting "$app" domain) +domain=$(ynh_app_setting_set "$app" domain) # Save sources & data ynh_backup "/var/www/${app}" "sources"