diff --git a/scripts/remove b/scripts/remove index b461cf8..6220f82 100755 --- a/scripts/remove +++ b/scripts/remove @@ -12,7 +12,7 @@ source /usr/share/yunohost/helpers #================================================= # LOAD SETTINGS #================================================= -ynh_script_progression --message="Loading installation settings..." --time --weight=1 +ynh_script_progression --message="Loading installation settings..." --weight=1 app=$YNH_APP_INSTANCE_NAME @@ -32,14 +32,14 @@ datadir=$(ynh_app_setting_get --app=$app --key=datadir) # Remove the service from the list of services known by YunoHost (added from `yunohost service add`) # if ynh_exec_warn_less yunohost service status $app >/dev/null # then -# ynh_script_progression --message="Removing $app service integration..." --time --weight=1 +# ynh_script_progression --message="Removing $app service integration..." --weight=1 # yunohost service remove $app # fi #================================================= # STOP AND REMOVE SERVICE #================================================= -# ynh_script_progression --message="Stopping and removing the systemd service..." --time --weight=1 +# ynh_script_progression --message="Stopping and removing the systemd service..." --weight=1 # Remove the dedicated systemd config # ynh_remove_systemd_config @@ -47,7 +47,7 @@ datadir=$(ynh_app_setting_get --app=$app --key=datadir) #================================================= # REMOVE LOGROTATE CONFIGURATION #================================================= -# ynh_script_progression --message="Removing logrotate configuration..." --time --weight=1 +# ynh_script_progression --message="Removing logrotate configuration..." --weight=1 # Remove the app-specific logrotate config # ynh_remove_logrotate @@ -55,7 +55,7 @@ datadir=$(ynh_app_setting_get --app=$app --key=datadir) #================================================= # REMOVE THE MYSQL DATABASE #================================================= -# ynh_script_progression --message="Removing the MySQL database..." --time --weight=1 +# ynh_script_progression --message="Removing the MySQL database..." --weight=1 # Remove a database if it exists, along with the associated user # ynh_mysql_remove_db --db_user=$db_user --db_name=$db_name @@ -63,7 +63,7 @@ datadir=$(ynh_app_setting_get --app=$app --key=datadir) #================================================= # REMOVE APP MAIN DIR #================================================= -ynh_script_progression --message="Removing app main directory..." --time --weight=1 +ynh_script_progression --message="Removing app main directory..." --weight=1 # Remove the app directory securely ynh_secure_remove --file="$final_path" @@ -75,14 +75,14 @@ ynh_secure_remove --file="$final_path" # Remove the data directory if --purge option is used # if [ "${YNH_APP_PURGE:-0}" -eq 1 ] # then -# ynh_script_progression --message="Removing app data directory..." --time --weight=1 +# ynh_script_progression --message="Removing app data directory..." --weight=1 # ynh_secure_remove --file="$datadir" # fi #================================================= # REMOVE NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Removing NGINX web server configuration..." --time --weight=1 +ynh_script_progression --message="Removing NGINX web server configuration..." --weight=1 # Remove the dedicated NGINX config ynh_remove_nginx_config @@ -90,7 +90,7 @@ ynh_remove_nginx_config #================================================= # REMOVE DEPENDENCIES #================================================= -ynh_script_progression --message="Removing dependencies..." --time --weight=1 +ynh_script_progression --message="Removing dependencies..." --weight=1 # Remove metapackage and its dependencies before removing php-fpm ynh_remove_app_dependencies @@ -98,7 +98,7 @@ ynh_remove_app_dependencies #================================================= # REMOVE PHP-FPM CONFIGURATION #================================================= -ynh_script_progression --message="Removing PHP-FPM configuration..." --time --weight=1 +ynh_script_progression --message="Removing PHP-FPM configuration..." --weight=1 # Remove the dedicated PHP-FPM config ynh_remove_fpm_config @@ -109,14 +109,14 @@ ynh_remove_fpm_config # if yunohost firewall list | grep -q "\- $port$" # then -# ynh_script_progression --message="Closing port $port..." --time --weight=1 +# ynh_script_progression --message="Closing port $port..." --weight=1 # ynh_exec_warn_less yunohost firewall disallow TCP $port # fi #================================================= # REMOVE FAIL2BAN CONFIGURATION #================================================= -# ynh_script_progression --message="Removing Fail2Ban configuration..." --time --weight=1 +# ynh_script_progression --message="Removing Fail2Ban configuration..." --weight=1 # Remove the dedicated Fail2Ban config # ynh_remove_fail2ban_config @@ -126,7 +126,7 @@ ynh_remove_fpm_config #================================================= # REMOVE VARIOUS FILES #================================================= -# ynh_script_progression --message="Removing various files..." --time --weight=1 +# ynh_script_progression --message="Removing various files..." --weight=1 # Remove a cron file # ynh_secure_remove --file="/etc/cron.d/$app" @@ -142,7 +142,7 @@ ynh_remove_fpm_config #================================================= # REMOVE DEDICATED USER #================================================= -ynh_script_progression --message="Removing the dedicated system user..." --time --weight=1 +ynh_script_progression --message="Removing the dedicated system user..." --weight=1 # Delete a system user ynh_system_user_delete --username=$app @@ -151,4 +151,4 @@ ynh_system_user_delete --username=$app # END OF SCRIPT #================================================= -ynh_script_progression --message="Removal of $app completed" --time --last +ynh_script_progression --message="Removal of $app completed" --last