Rename variables according to key names
This commit is contained in:
+4
-4
@@ -14,14 +14,14 @@ api_secret="$(ynh_string_random --length=32)"
|
|||||||
app_key="$(ynh_string_random --length=32)"
|
app_key="$(ynh_string_random --length=32)"
|
||||||
phantomjs_key="$(ynh_string_random --length=32)"
|
phantomjs_key="$(ynh_string_random --length=32)"
|
||||||
|
|
||||||
email_fullname="$(ynh_user_get_info --username=$admin --key=fullname)"
|
default_from_email_name="$(ynh_user_get_info --username=$admin --key=fullname)"
|
||||||
email="$(ynh_user_get_info --username=$admin --key=mail)"
|
default_from_email_address="$(ynh_user_get_info --username=$admin --key=mail)"
|
||||||
|
|
||||||
ynh_app_setting_set --key=api_secret --value=$api_secret
|
ynh_app_setting_set --key=api_secret --value=$api_secret
|
||||||
ynh_app_setting_set --key=app_key --value=$app_key
|
ynh_app_setting_set --key=app_key --value=$app_key
|
||||||
ynh_app_setting_set --key=phantomjs_key --value=$phantomjs_key
|
ynh_app_setting_set --key=phantomjs_key --value=$phantomjs_key
|
||||||
ynh_app_setting_set --key=default_from_email_address --value="$email"
|
ynh_app_setting_set --key=default_from_email_address --value="$default_from_email_address"
|
||||||
ynh_app_setting_set --key=default_from_email_name --value="$email_fullname"
|
ynh_app_setting_set --key=default_from_email_name --value="$default_from_email_name"
|
||||||
|
|
||||||
#=================================================
|
#=================================================
|
||||||
# DOWNLOAD, CHECK AND UNPACK SOURCE
|
# DOWNLOAD, CHECK AND UNPACK SOURCE
|
||||||
|
|||||||
+8
-8
@@ -17,16 +17,16 @@ ynh_app_setting_delete --key=email_lastname
|
|||||||
ynh_app_setting_delete --key=email # also delete unnecessary duplicate of state storage
|
ynh_app_setting_delete --key=email # also delete unnecessary duplicate of state storage
|
||||||
|
|
||||||
# Retrieve `$admin` user settings
|
# Retrieve `$admin` user settings
|
||||||
mail_from_name=$(ynh_app_setting_get --key=default_from_email_address)
|
default_from_email_address=$(ynh_app_setting_get --key=default_from_email_address)
|
||||||
if [ -z "$mail_from_name" ]; then
|
if [ -z "$default_from_email_address" ]; then
|
||||||
mail_from_name="${app}@${domain}"
|
default_from_email_address="${app}@${domain}"
|
||||||
ynh_app_setting_set --key=default_from_email_address --value="$mail_from_name"
|
ynh_app_setting_set --key=default_from_email_address --value="$default_from_email_address"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
mail_from_sender=$(ynh_app_setting_get --key=default_from_email_name)
|
default_from_email_name=$(ynh_app_setting_get --key=default_from_email_name)
|
||||||
if [ -z "$mail_from_sender" ]; then
|
if [ -z "$default_from_email_name" ]; then
|
||||||
mail_from_sender="${app}@${domain}"
|
default_from_email_name="${app}@${domain}"
|
||||||
ynh_app_setting_set --key=default_from_email_name --value="$mail_from_sender"
|
ynh_app_setting_set --key=default_from_email_name --value="$default_from_email_name"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
ynh_app_setting_set_default --key=api_secret --value="$(ynh_string_random --length=32)"
|
ynh_app_setting_set_default --key=api_secret --value="$(ynh_string_random --length=32)"
|
||||||
|
|||||||
Reference in New Issue
Block a user