From 4180d0c8401ca23b8baebaeaaf01bca47214cfdd Mon Sep 17 00:00:00 2001 From: Selamanse Date: Wed, 27 Sep 2017 19:52:56 +0200 Subject: [PATCH] Fixes ynh_die not found and port variable unbound --- scripts/install | 2 +- scripts/remove | 2 +- scripts/restore | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/install b/scripts/install index b568275..530c234 100644 --- a/scripts/install +++ b/scripts/install @@ -7,8 +7,8 @@ set -eu # IMPORT GENERIC HELPERS #================================================= -source ./_common.sh source /usr/share/yunohost/helpers +source ./_common.sh #================================================= # MANAGE SCRIPT FAILURE diff --git a/scripts/remove b/scripts/remove index e025c1f..88e1f51 100644 --- a/scripts/remove +++ b/scripts/remove @@ -7,8 +7,8 @@ set -u # IMPORT GENERIC HELPERS #================================================= -source ./_common.sh source /usr/share/yunohost/helpers +source ./_common.sh app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get $app domain) diff --git a/scripts/restore b/scripts/restore index 7c32b7c..d92bfe7 100644 --- a/scripts/restore +++ b/scripts/restore @@ -9,8 +9,8 @@ if [ ! -e _common.sh ]; then sudo cp ../settings/scripts/_common.sh ./_common.sh sudo chmod a+rx _common.sh fi -source _common.sh source /usr/share/yunohost/helpers +source _common.sh #================================================= # GENERIC START @@ -31,6 +31,7 @@ domain=$(ynh_app_setting_get $app domain) path=$(ynh_app_setting_get $app path) final_path=$(ynh_app_setting_get $app final_path) serviceuser=$(ynh_app_setting_get $app serviceuser) +port=$(ynh_app_setting_get $app port) # Check domain/path availability sudo yunohost app checkurl "${domain}${path}" -a "$app" || ynh_die @@ -87,4 +88,3 @@ sudo mongorestore ./dump sudo systemctl start rocketchat waitforservice -