From e43582b7b73c923c7959140cf67032954f278d24 Mon Sep 17 00:00:00 2001 From: Kayou Date: Thu, 14 Feb 2019 23:27:46 +0100 Subject: [PATCH 1/2] fix package_linter --- scripts/install | 4 ++-- scripts/remove | 11 +++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index 9a54996..8e1cea4 100644 --- a/scripts/install +++ b/scripts/install @@ -74,7 +74,7 @@ ynh_app_setting_set $app path $path_url ynh_install_app_dependencies build-essential libssl-dev zlib1g-dev libpng-dev libpq-dev memcached postgresql # Install Carton -echo yes | sudo cpan Carton +echo yes | cpan Carton #================================================= # CREATE A POSTGRESQL DATABASE @@ -176,7 +176,7 @@ fi # Configure owner #================================================= -sudo chown -R www-data $final_path +chown -R www-data $final_path #================================================= # Start lstu diff --git a/scripts/remove b/scripts/remove index 94eb6b8..3b3051c 100644 --- a/scripts/remove +++ b/scripts/remove @@ -22,6 +22,17 @@ db_user=$db_name #================================================= # STANDARD REMOVE +#================================================= +# 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 + #================================================= # STOP AND REMOVE SERVICE #================================================= From 04fa86cd7e92ac61b7a452773f424a3188fcaae6 Mon Sep 17 00:00:00 2001 From: Kayou Date: Thu, 14 Feb 2019 23:37:31 +0100 Subject: [PATCH 2/2] update helper --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 423ac1d..5208e48 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -43,7 +43,7 @@ ynh_systemd_action() { # Following the starting of the app in its log if [ "$log_path" == "systemd" ] ; then # Read the systemd journal - journalctl -u $service_name -f --since=-45 > "$templog" & + journalctl --unit=$service_name --follow --since=-0 --quiet > "$templog" & else # Read the specified log file tail -F -n0 "$log_path" > "$templog" &