aboutsummaryrefslogtreecommitdiff
path: root/scripts/remove
diff options
context:
space:
mode:
authoryalh76 <yalh@yahoo.com>2020-02-26 19:32:42 +0100
committerGitHub <noreply@github.com>2020-02-26 19:32:42 +0100
commit53aeae382eda1263d0ebf9a454bd1c3eeca8ddb1 (patch)
tree4863f9656e46cbf77b2dcde17160fe3e477d77c8 /scripts/remove
parentdf1d3b83108d43e898b99e26adbeea32d8961b69 (diff)
parent2b588c79f4c1a28f0ffe25781a68673abe69434c (diff)
downloadmastodon_ynh-53aeae382eda1263d0ebf9a454bd1c3eeca8ddb1.tar.gz
mastodon_ynh-53aeae382eda1263d0ebf9a454bd1c3eeca8ddb1.tar.bz2
mastodon_ynh-53aeae382eda1263d0ebf9a454bd1c3eeca8ddb1.zip
Merge pull request #195 from YunoHost-Apps/testing
Apply example_ynh
Diffstat (limited to 'scripts/remove')
-rw-r--r--scripts/remove12
1 files changed, 7 insertions, 5 deletions
diff --git a/scripts/remove b/scripts/remove
index 3db3310..f2b2e16 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -27,23 +27,24 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path)
#=================================================
# STANDARD REMOVE
#=================================================
-# REMOVE SERVICE FROM ADMIN PANEL
+# REMOVE SERVICE INTEGRATION IN YUNOHOST
#=================================================
+ynh_script_progression --message="Removing service integration in YunoHost..." --weight=2
-# Remove a service from the admin panel, added by `yunohost service add`
-if yunohost service status "$app-web" >/dev/null 2>&1
+# 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..." --weight=2
yunohost service remove "$app-web"
fi
-if yunohost service status "$app-sidekiq" >/dev/null 2>&1
+if ynh_exec_warn_less yunohost service status "$app-sidekiq" >/dev/null
then
ynh_script_progression --message="Removing $app-sidekiq service..." --weight=2
yunohost service remove "$app-sidekiq"
fi
-if yunohost service status "$app-streaming" >/dev/null 2>&1
+if ynh_exec_warn_less yunohost service status "$app-streaming" >/dev/null
then
ynh_script_progression --message="Removing $app-streaming service..." --weight=2
yunohost service remove "$app-streaming"
@@ -99,6 +100,7 @@ ynh_remove_nginx_config
#=================================================
# REMOVE THE CRON FILE
#=================================================
+ynh_script_progression --message="Removing the cron file..." --weight=2
# Remove a cron file
ynh_secure_remove --file="/etc/cron.d/$app"