From 684f232d4a3ce7eb70d401d6a1437ffa916d3d5d Mon Sep 17 00:00:00 2001
From: CodeShakingSheep <19874562+CodeShakingSheep@users.noreply.github.com>
Date: Mon, 9 Feb 2026 09:52:44 -0600
Subject: [PATCH] Rename variables according to key names

---
 scripts/install |  8 ++++----
 scripts/upgrade | 16 ++++++++--------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/scripts/install b/scripts/install
index b539652..f8cd020 100755
--- a/scripts/install
+++ b/scripts/install
@@ -14,14 +14,14 @@ api_secret="$(ynh_string_random --length=32)"
 app_key="$(ynh_string_random --length=32)"
 phantomjs_key="$(ynh_string_random --length=32)"
 
-email_fullname="$(ynh_user_get_info --username=$admin --key=fullname)"
-email="$(ynh_user_get_info --username=$admin --key=mail)"
+default_from_email_name="$(ynh_user_get_info --username=$admin --key=fullname)"
+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=app_key --value=$app_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_name --value="$email_fullname"
+ynh_app_setting_set --key=default_from_email_address --value="$default_from_email_address"
+ynh_app_setting_set --key=default_from_email_name --value="$default_from_email_name"
 
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
diff --git a/scripts/upgrade b/scripts/upgrade
index 960bba4..de2e82e 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -17,16 +17,16 @@ ynh_app_setting_delete --key=email_lastname
 ynh_app_setting_delete --key=email # also delete unnecessary duplicate of state storage
 
 # Retrieve `$admin` user settings
-mail_from_name=$(ynh_app_setting_get --key=default_from_email_address)
-if [ -z "$mail_from_name" ]; then
-	mail_from_name="${app}@${domain}"
-	ynh_app_setting_set --key=default_from_email_address --value="$mail_from_name"
+default_from_email_address=$(ynh_app_setting_get --key=default_from_email_address)
+if [ -z "$default_from_email_address" ]; then
+	default_from_email_address="${app}@${domain}"
+	ynh_app_setting_set --key=default_from_email_address --value="$default_from_email_address"
 fi
 
-mail_from_sender=$(ynh_app_setting_get --key=default_from_email_name)
-if [ -z "$mail_from_sender" ]; then
-	mail_from_sender="${app}@${domain}"
-	ynh_app_setting_set --key=default_from_email_name --value="$mail_from_sender"
+default_from_email_name=$(ynh_app_setting_get --key=default_from_email_name)
+if [ -z "$default_from_email_name" ]; then
+	default_from_email_name="${app}@${domain}"
+	ynh_app_setting_set --key=default_from_email_name --value="$default_from_email_name"
 fi
 
 ynh_app_setting_set_default --key=api_secret --value="$(ynh_string_random --length=32)"