From 387ff9676ca92e5dbbc2c12bba72c94651124126 Mon Sep 17 00:00:00 2001 From: anmol26s <5068843+anmol26s@users.noreply.github.com> Date: Sat, 14 Oct 2023 21:29:40 +0530 Subject: [PATCH] Fix random_string check acc to YNH recommended way for upgrade As setting variables are now loaded by default on package upgrade. So, no need to get the variables in the environment, but still it needs to checked for empty value and if it exists in the /app/setting. --- scripts/upgrade | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index b1233c8b..66ad8d17 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -15,8 +15,6 @@ source /usr/share/yunohost/helpers ynh_script_progression --message="Loading settings..." --weight=1 email=$(ynh_user_get_info --username=$admin --key=mail) -random_string=$(ynh_app_setting_get --app=$app --key=random_string) - #================================================= # CHECK VERSION @@ -32,7 +30,7 @@ upgrade_type=$(ynh_check_app_version_changed) ynh_script_progression --message="Ensuring downward compatibility..." --weight=1 # If random_string doesn't exist, create it -if [ -z "$random_string" ]; then +if [ -z "${random_string:-}" ]; then random_string="$(ynh_string_random --length=48)" ynh_app_setting_set --app=$app --key=random_string --value=$random_string fi