From d428b3a1119a528555edb3b5f6b923ed610ef4ef Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 11 Nov 2020 09:48:16 +0100 Subject: [PATCH] reset app name as variable --- scripts/backup | 2 +- scripts/install | 2 +- scripts/remove | 4 ++-- scripts/restore | 4 ++-- scripts/upgrade | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/backup b/scripts/backup index a3ce283..98d4c61 100755 --- a/scripts/backup +++ b/scripts/backup @@ -61,4 +61,4 @@ ynh_mysql_dump_db "$db_name" > db.sql # END OF SCRIPT #================================================= -ynh_print_info "Backup script completed for Webtrees. (YunoHost will then actually copy those files to the archive)." +ynh_print_info "Backup script completed for $app. (YunoHost will then actually copy those files to the archive)." diff --git a/scripts/install b/scripts/install index f2b4583..17c5af4 100755 --- a/scripts/install +++ b/scripts/install @@ -182,4 +182,4 @@ ynh_send_readme_to_admin "$message" # END OF SCRIPT #================================================= -ynh_script_progression --message="Installation of Webtrees completed" +ynh_script_progression --message="Installation of $app completed" diff --git a/scripts/remove b/scripts/remove index 1384dc6..a2906e1 100755 --- a/scripts/remove +++ b/scripts/remove @@ -41,7 +41,7 @@ ynh_remove_app_dependencies #================================================= # REMOVE APP MAIN DIR #================================================= -ynh_script_progression --message="Removing Webtrees main directory..." +ynh_script_progression --message="Removing $app main directory..." # Remove the app directory securely ynh_secure_remove --file="$final_path" @@ -76,4 +76,4 @@ ynh_system_user_delete --username=$app # END OF SCRIPT #================================================= -ynh_script_progression --message="Removal of Webtrees completed" +ynh_script_progression --message="Removal of $app completed" diff --git a/scripts/restore b/scripts/restore index 2d85b23..fc63a56 100644 --- a/scripts/restore +++ b/scripts/restore @@ -50,7 +50,7 @@ ynh_restore_file "/etc/nginx/conf.d/$domain.d/$app.conf" #================================================= # RESTORE THE APP MAIN DIR #================================================= -ynh_script_progression --message="Restoring Webtrees main directory..." +ynh_script_progression --message="Restoring $app main directory..." ynh_restore_file "$final_path" @@ -109,4 +109,4 @@ ynh_systemd_action --service_name=nginx --action=reload # END OF SCRIPT #================================================= -ynh_script_progression --message="Restoration completed for Webtrees" +ynh_script_progression --message="Restoration completed for $app" diff --git a/scripts/upgrade b/scripts/upgrade index 996197f..1b3972c 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -51,7 +51,7 @@ fi #================================================= # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP #================================================= -ynh_script_progression --message="Backing up Webtrees before upgrading (may take a while)..." +ynh_script_progression --message="Backing up $app before upgrading (may take a while)..." # Backup the current version of the app ynh_backup_before_upgrade @@ -145,4 +145,4 @@ ynh_systemd_action --service_name=nginx --action=reload # END OF SCRIPT #================================================= -ynh_script_progression --message="Upgrade of Webtrees completed" --last +ynh_script_progression --message="Upgrade of $app completed" --last