aboutsummaryrefslogtreecommitdiff
path: root/scripts/remove
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/remove')
-rw-r--r--scripts/remove38
1 files changed, 16 insertions, 22 deletions
diff --git a/scripts/remove b/scripts/remove
index c8ca3a3..297786f 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -1,11 +1,5 @@
#!/bin/bash
-#=================================================
-# GENERIC START
-#=================================================
-# IMPORT GENERIC HELPERS
-#=================================================
-
source _common.sh
source ynh_add_swap
source /usr/share/yunohost/helpers
@@ -15,44 +9,44 @@ source /usr/share/yunohost/helpers
#=================================================
# REMOVE SYSTEMD SERVICE
#=================================================
-ynh_script_progression --message="Removing system configurations related to $app..." --weight=1
+ynh_script_progression "Removing system configurations related to $app..."
# 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-web" >/dev/null
+if ynh_hide_warnings yunohost service status "$app-web" >/dev/null
then
- ynh_script_progression --message="Removing $app-web service integration..." --weight=1
+ ynh_script_progression "Removing $app-web service integration..."
yunohost service remove "$app-web"
fi
-if ynh_exec_warn_less yunohost service status "$app-sidekiq" >/dev/null
+if ynh_hide_warnings yunohost service status "$app-sidekiq" >/dev/null
then
- ynh_script_progression --message="Removing $app-sidekiq service integration..." --weight=1
+ ynh_script_progression "Removing $app-sidekiq service integration..."
yunohost service remove "$app-sidekiq"
fi
-if ynh_exec_warn_less yunohost service status "$app-streaming" >/dev/null
+if ynh_hide_warnings yunohost service status "$app-streaming" >/dev/null
then
- ynh_script_progression --message="Removing $app-streaming service integration..." --weight=1
+ ynh_script_progression "Removing $app-streaming service integration..."
yunohost service remove "$app-streaming"
fi
# Remove the dedicated systemd config
-ynh_remove_systemd_config --service="$app-web"
-ynh_remove_systemd_config --service="$app-sidekiq"
-ynh_remove_systemd_config --service="$app-streaming"
+ynh_config_remove_systemd "$app-web"
+ynh_config_remove_systemd "$app-sidekiq"
+ynh_config_remove_systemd "$app-streaming"
# Remove the dedicated NGINX config
-ynh_remove_nginx_config
+ynh_config_remove_nginx
# Remove a cron file
-ynh_secure_remove --file="/etc/cron.d/$app"
+ynh_safe_rm "/etc/cron.d/$app"
# Remote logrotate config
-ynh_remove_logrotate
+ynh_config_remove_logrotate
# Remove metapackage and its dependencies
-ynh_remove_ruby
-ynh_remove_nodejs
+ynh_ruby_remove
+ynh_nodejs_remove
# Remove swap
ynh_del_swap
@@ -61,4 +55,4 @@ ynh_del_swap
# END OF SCRIPT
#=================================================
-ynh_script_progression --message="Removal of $app completed" --last
+ynh_script_progression "Removal of $app completed"