From 31d83f858abb7d4bb7dc99ac0cd02acc5bb3a597 Mon Sep 17 00:00:00 2001 From: Maniack Crudelis Date: Sun, 19 Apr 2020 00:28:14 +0200 Subject: [PATCH] Drop YNH_APP_ID --- scripts/actions/public_private | 2 +- scripts/actions/reset_default_app | 2 +- scripts/actions/reset_default_system | 2 +- scripts/config | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/actions/public_private b/scripts/actions/public_private index 6615ab9..397212c 100755 --- a/scripts/actions/public_private +++ b/scripts/actions/public_private @@ -22,7 +22,7 @@ ynh_abort_if_errors # Get is_public is_public=${YNH_ACTION_IS_PUBLIC} -app=${YNH_APP_INSTANCE_NAME:-$YNH_APP_ID} +app=$YNH_APP_INSTANCE_NAME #================================================= # CHECK IF ARGUMENTS ARE CORRECT diff --git a/scripts/actions/reset_default_app b/scripts/actions/reset_default_app index bb63459..f4205f6 100755 --- a/scripts/actions/reset_default_app +++ b/scripts/actions/reset_default_app @@ -21,7 +21,7 @@ ynh_abort_if_errors # RETRIEVE ARGUMENTS #================================================= -app=${YNH_APP_INSTANCE_NAME:-$YNH_APP_ID} +app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get --app=$app --key=domain) path_url=$(ynh_app_setting_get --app=$app --key=path) diff --git a/scripts/actions/reset_default_system b/scripts/actions/reset_default_system index 1dd2617..254970f 100755 --- a/scripts/actions/reset_default_system +++ b/scripts/actions/reset_default_system @@ -21,7 +21,7 @@ ynh_abort_if_errors # RETRIEVE ARGUMENTS #================================================= -app=${YNH_APP_INSTANCE_NAME:-$YNH_APP_ID} +app=$YNH_APP_INSTANCE_NAME type=$1 diff --git a/scripts/config b/scripts/config index ef235d6..3f57515 100644 --- a/scripts/config +++ b/scripts/config @@ -14,7 +14,7 @@ source _ynh_add_fpm_config # RETRIEVE ARGUMENTS #================================================= -app=${YNH_APP_INSTANCE_NAME:-$YNH_APP_ID} +app=$YNH_APP_INSTANCE_NAME fpm_config_dir=$(ynh_app_setting_get --app=$app --key=fpm_config_dir)