From 5dfdd97b593d29252febf6f06a09bdf45809a8c1 Mon Sep 17 00:00:00 2001 From: oufmilo <44617467+oufmilo@users.noreply.github.com> Date: Fri, 29 Dec 2023 16:09:53 +0100 Subject: [PATCH] Clean --- scripts/backup | 1 - scripts/install | 7 ------- scripts/remove | 2 -- scripts/restore | 1 - scripts/upgrade | 5 ++--- 5 files changed, 2 insertions(+), 14 deletions(-) diff --git a/scripts/backup b/scripts/backup index 3b56e4e..d3f6e8d 100755 --- a/scripts/backup +++ b/scripts/backup @@ -5,7 +5,6 @@ #================================================= # IMPORT GENERIC HELPERS #================================================= - # Keep this path for calling _common.sh inside the execution's context of backup and restore scripts source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers diff --git a/scripts/install b/scripts/install index 08a2688..09bf070 100755 --- a/scripts/install +++ b/scripts/install @@ -13,12 +13,6 @@ source /usr/share/yunohost/helpers # RETRIEVE ARGUMENTS FROM THE MANIFEST #================================================= - - -#================================================= -# STANDARD MODIFICATIONS -#================================================= - #================================================= # INSTALL DEPENDENCIES #================================================= @@ -114,7 +108,6 @@ ynh_script_progression --message="Starting a systemd service..." --weight=1 # Start a systemd service ynh_systemd_action --service_name=$app --action="start" --log_path=systemd --line_match="All workers started" - #================================================= # END OF SCRIPT #================================================= diff --git a/scripts/remove b/scripts/remove index cd77957..f1cda10 100755 --- a/scripts/remove +++ b/scripts/remove @@ -9,7 +9,6 @@ source _common.sh source /usr/share/yunohost/helpers - #================================================= # STANDARD REMOVE #================================================= @@ -67,7 +66,6 @@ ynh_remove_nodejs #================================================= # REMOVE VARIOUS FILES #================================================= - # Remove the log files ynh_secure_remove --file="/var/log/$app" diff --git a/scripts/restore b/scripts/restore index 1d41ff4..3be314c 100755 --- a/scripts/restore +++ b/scripts/restore @@ -62,7 +62,6 @@ ynh_psql_execute_file_as_root --file="./db.sql" --database=$db_name #================================================= # SECURE FILES AND DIRECTORIES #================================================= - # Set permissions to app files chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" diff --git a/scripts/upgrade b/scripts/upgrade index f37b7b1..a860987 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -9,7 +9,6 @@ source _common.sh source /usr/share/yunohost/helpers - #================================================= # CHECK VERSION #================================================= @@ -27,7 +26,7 @@ upgrade_type=$(ynh_check_app_version_changed) ynh_script_progression --message="Stopping a systemd service..." --weight=1 # Stop service before backup, to not loose message in case of failed upgrade and restore -ynh_systemd_action --service_name=$app --action="stop" --log_path=systemd --line_match="Stopped" +ynh_systemd_action --service_name=$app --action="stop" --log_path=systemd #================================================= # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP @@ -136,7 +135,7 @@ yunohost service add $app --description="A interplanetary blogging platform" --l #================================================= ynh_script_progression --message="Starting a systemd service..." --weight=1 -ynh_systemd_action --service_name=$app --action="start" --log_path=systemd --line_match="All workers started" +ynh_systemd_action --service_name=$app --action="start" --log_path=systemd #=================================================