aboutsummaryrefslogtreecommitdiff
path: root/scripts/remove
diff options
context:
space:
mode:
authoreric_G <46165813+ericgaspar@users.noreply.github.com>2025-09-01 11:40:59 +0200
committereric_G <46165813+ericgaspar@users.noreply.github.com>2025-09-01 11:40:59 +0200
commitf153dc5aa68f66d3fabe39baa54f7fcdad8e3ebf (patch)
tree3ec47391ead537455cb4c613fc22654258a1d07c /scripts/remove
parent8d27dd88c49efc56bf983df313dc42af26c63a77 (diff)
parentedbf9871a19fd30634d86e7ff41d4f33b92521d4 (diff)
downloadmastodon_ynh-f153dc5aa68f66d3fabe39baa54f7fcdad8e3ebf.tar.gz
mastodon_ynh-f153dc5aa68f66d3fabe39baa54f7fcdad8e3ebf.tar.bz2
mastodon_ynh-f153dc5aa68f66d3fabe39baa54f7fcdad8e3ebf.zip
Merge branch 'testing' into pr/466
Diffstat (limited to 'scripts/remove')
-rw-r--r--scripts/remove40
1 files changed, 13 insertions, 27 deletions
diff --git a/scripts/remove b/scripts/remove
index f5eca20..6b978fb 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -1,57 +1,43 @@
#!/bin/bash
-#=================================================
-# GENERIC START
-#=================================================
-# IMPORT GENERIC HELPERS
-#=================================================
-
source _common.sh
source /usr/share/yunohost/helpers
#=================================================
# REMOVE SYSTEM CONFIGURATIONS
#=================================================
-# 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
-then
- ynh_script_progression --message="Removing $app-web service integration..." --weight=1
+if ynh_hide_warnings yunohost service status "$app-web" >/dev/null; then
yunohost service remove "$app-web"
fi
-if ynh_exec_warn_less yunohost service status "$app-sidekiq" >/dev/null
-then
- ynh_script_progression --message="Removing $app-sidekiq service integration..." --weight=1
+if ynh_hide_warnings yunohost service status "$app-sidekiq" >/dev/null; then
yunohost service remove "$app-sidekiq"
fi
-if ynh_exec_warn_less yunohost service status "$app-streaming" >/dev/null
-then
- ynh_script_progression --message="Removing $app-streaming service integration..." --weight=1
+if ynh_hide_warnings yunohost service status "$app-streaming" >/dev/null; then
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
@@ -60,4 +46,4 @@ ynh_del_swap
# END OF SCRIPT
#=================================================
-ynh_script_progression --message="Removal of $app completed" --last
+ynh_script_progression "Removal of $app completed"