From e442fbb812c82c57913603370e59ee204b13295c Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 24 May 2020 10:50:26 +0200 Subject: [PATCH] more explicit info --- scripts/change_url | 6 +++--- scripts/install | 4 ++-- scripts/remove | 2 +- scripts/upgrade | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/scripts/change_url b/scripts/change_url index 5919876..61a48cb 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -37,7 +37,7 @@ db_pwd=$(ynh_app_setting_get --app=$app --key=db_pwd) #================================================= # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP #================================================= -ynh_script_progression --message="Backing up the app before changing its url (may take a while)..." --weight=1 +ynh_script_progression --message="Backing up $app before changing its url (may take a while)..." --weight=1 # Backup the current version of the app ynh_backup_before_upgrade @@ -79,7 +79,7 @@ ynh_systemd_action --service_name="$app" --action="stop" --log_path="/var/log/$a #================================================= # MODIFY URL IN NGINX CONF #================================================= -ynh_script_progression --message="Updating nginx web server configuration..." --weight=1 +ynh_script_progression --message="Updating Nginx web server configuration..." --weight=1 nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf @@ -117,7 +117,7 @@ ynh_systemd_action --service_name="$app" --action="start" --log_path="systemd" - #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading nginx web server..." --weight=1 +ynh_script_progression --message="Reloading Nginx web server..." --weight=1 ynh_systemd_action --service_name=nginx --action=reload diff --git a/scripts/install b/scripts/install index 4862ca2..719407f 100644 --- a/scripts/install +++ b/scripts/install @@ -100,7 +100,7 @@ ynh_setup_source --dest_dir="$final_path" #================================================= # NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Configuring nginx web server..." --weight=2 +ynh_script_progression --message="Configuring Nginx web server..." --weight=2 # Create a dedicated nginx config ynh_add_nginx_config @@ -128,7 +128,7 @@ cp ../conf/.sequelizerc.example "$final_path"/.sequelizerc #============================================== # INSTALL CODIMD #============================================== -ynh_script_progression --message="Building application... (this will take some time and resources!)" --weight=240 +ynh_script_progression --message="Building $app... (this will take some time and resources!)" --weight=240 pushd "$final_path" || ynh_die diff --git a/scripts/remove b/scripts/remove index 6a47a30..8d9ff85 100644 --- a/scripts/remove +++ b/scripts/remove @@ -64,7 +64,7 @@ ynh_remove_nodejs #================================================= # REMOVE APP MAIN DIR #================================================= -ynh_script_progression --message="Removing app main directory..." --weight=6 +ynh_script_progression --message="Removing $app main directory..." --weight=6 # Remove the app directory securely ynh_secure_remove --file="$final_path" diff --git a/scripts/upgrade b/scripts/upgrade index 6736bb0..1787967 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -31,7 +31,7 @@ upgrade_type=$(ynh_check_app_version_changed) #================================================= # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP #================================================= -ynh_script_progression --message="Backing up the app before upgrading (may take a while)..." --weight=120 +ynh_script_progression --message="Backing up $app before upgrading (may take a while)..." --weight=120 # Backup the current version of the app ynh_backup_before_upgrade @@ -105,7 +105,7 @@ ynh_install_app_dependencies $pkg_dependencies #============================================== if [ "$upgrade_type" == "UPGRADE_APP" ] then - ynh_script_progression --message="Building application... (this will take some time and resources!)" --weight=160 + ynh_script_progression --message="Building $app... (this will take some time and resources!)" --weight=160 pushd "$final_path" @@ -163,7 +163,7 @@ ynh_systemd_action --service_name="$app" --action="start" --log_path="systemd" - #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading nginx web server..." --weight=1 +ynh_script_progression --message="Reloading Nginx web server..." --weight=1 ynh_systemd_action --service_name=nginx --action=reload