1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/ttrss_ynh.git synced 2024-10-01 13:34:46 +02:00

Merge pull request #56 from alexAubin/patch-1

Service was added during install, but not remove during remove...
This commit is contained in:
Maniack Crudelis 2019-02-16 13:30:09 +01:00 committed by GitHub
commit fdc2ec9388
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 4 deletions

View file

@ -1,4 +1,4 @@
Tiny-Tiny RSS package for YunoHost
======================
http://tt-rss.org/redmine/projects/tt-rss/wiki
https://git.tt-rss.org/git/tt-rss/wiki

View file

@ -64,6 +64,17 @@ ynh_remove_fpm_config
ynh_remove_systemd_config
#=================================================
# REMOVE SERVICE FROM ADMIN PANEL
#=================================================
# Remove a service from the admin panel, added by `yunohost service add`
if yunohost service status | grep -q $app
then
echo "Remove $app service"
yunohost service remove $app
fi
#=================================================
# GENERIC FINALIZATION
#=================================================

View file

@ -34,9 +34,6 @@ if [ -z $db_name ]; then # If db_name doesn't exist, create it
ynh_app_setting_set $app db_name $db_name
fi
# Remove old cron job
ynh_secure_remove "/etc/cron.d/$app"
#=================================================
# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
#=================================================
@ -47,6 +44,13 @@ ynh_clean_setup () {
}
ynh_abort_if_errors # Active trap pour arrêter le script si une erreur est détectée.
#=================================================
# ENSURE DOWNWARD COMPATIBILITY BIS
#=================================================
# Remove old cron job
ynh_secure_remove "/etc/cron.d/$app"
#=================================================
# CHECK THE PATH
#=================================================