From d69f4453c193b8109869192a86e3447d1de3449c Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 4 Jan 2021 13:34:51 +0100 Subject: [PATCH] Fix linter warnings --- scripts/install | 4 ++-- scripts/remove | 23 +++++++++++++++++------ scripts/restore | 25 ++++++++++++++++++------- scripts/upgrade | 14 +++++++++++--- 4 files changed, 48 insertions(+), 18 deletions(-) diff --git a/scripts/install b/scripts/install index 14435c0..1c34bd7 100644 --- a/scripts/install +++ b/scripts/install @@ -73,7 +73,7 @@ yunohost firewall allow Both "$port" ynh_script_progression --message="Installing dependencies..." --weight=4 # Install Mumble Debian package via apt -ynh_install_app_dependencies $pkg_dependencies +ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies #================================================= # SPECIFIC SETUP @@ -142,7 +142,7 @@ systemctl disable mumble-server --quiet ynh_script_progression --message="Integrating service in YunoHost..." # Add Mumble as a YunoHost service -yunohost service add $app --description="Mumble server" --log="/var/log/$app/$app.log" +yunohost service add $app --description="Mumble server" --log="/var/log/$app/$app.log" --needs_exposed_ports $port systemctl restart "$app" diff --git a/scripts/remove b/scripts/remove index ef0daad..1a65607 100644 --- a/scripts/remove +++ b/scripts/remove @@ -12,6 +12,7 @@ source /usr/share/yunohost/helpers #================================================= # LOAD SETTINGS #================================================= +ynh_script_progression --message="Loading installation settings..." --weight=1 app=$YNH_APP_INSTANCE_NAME @@ -25,15 +26,17 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path) # REMOVE SERVICE FROM ADMIN PANEL #================================================= -if yunohost service status | grep -q "$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 >/dev/null then - echo "Remove $app service" - yunohost service remove "$app" + ynh_script_progression --message="Removing $app service integration..." --weight=1 + yunohost service remove $app fi #================================================= # STOP AND REMOVE SERVICE #================================================= +ynh_script_progression --message="Stopping and removing the systemd service..." --weight=2 # Remove the dedicated systemd config ynh_remove_systemd_config @@ -41,6 +44,7 @@ ynh_remove_systemd_config #================================================= # REMOVE DEPENDENCIES #================================================= +ynh_script_progression --message="Removing dependencies..." --weight=1 # Remove metapackage and its dependencies ynh_remove_app_dependencies @@ -48,9 +52,10 @@ ynh_remove_app_dependencies #================================================= # REMOVE APP MAIN DIR #================================================= +ynh_script_progression --message="Removing app main directory..." --weight=2 # Remove the app directory securely -ynh_secure_remove "$final_path" +ynh_secure_remove --file="$final_path" #================================================= # CLOSE A PORT @@ -58,8 +63,8 @@ ynh_secure_remove "$final_path" if yunohost firewall list | grep -q "\- $port$" then - echo "Close port $port" - yunohost firewall disallow Both "$port" > /dev/null 2>&1 + ynh_script_progression --message="Close port $port" --weight=1 + ynh_exec_warn_less yunohost firewall disallow Both $port fi #================================================= @@ -69,3 +74,9 @@ fi #================================================= ynh_secure_remove "/var/log/mumble-server/$app.log" + +#================================================= +# END OF SCRIPT +#================================================= + +ynh_script_progression --message="Removal of $app completed" --last diff --git a/scripts/restore b/scripts/restore index 099e705..6aeb760 100644 --- a/scripts/restore +++ b/scripts/restore @@ -18,14 +18,17 @@ ynh_abort_if_errors #================================================= # LOAD SETTINGS #================================================= +ynh_script_progression --message="Loading installation settings..." --weight=1 app=$YNH_APP_INSTANCE_NAME -final_path=$(ynh_app_setting_get "$app" final_path) +final_path=$(ynh_app_setting_get --app=$app --key=final_path) +port=$(ynh_app_setting_get --app=$app --key=port) #================================================= # CHECK IF THE APP CAN BE RESTORED #================================================= +ynh_script_progression --message="Validating restoration parameters..." --weight=1 test ! -d "$final_path" \ || ynh_die "There is already a directory: $final_path " @@ -35,14 +38,16 @@ test ! -d "$final_path" \ #================================================= # RESTORE THE APP MAIN DIR #================================================= +ynh_script_progression --message="Restoring the app main directory..." --weight=2 -ynh_restore_file "$final_path" +ynh_restore_file --origin_path="$final_path" #================================================= # SPECIFIC RESTORATION #================================================= # REINSTALL DEPENDENCIES #================================================= +ynh_script_progression --message="Reinstalling dependencies..." --weight=4 # Define and install dependencies ynh_install_app_dependencies $pkg_dependencies @@ -71,22 +76,28 @@ systemctl disable mumble-server --quiet #================================================= # ADVERTISE SERVICE IN ADMIN PANEL #================================================= +ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 # Add Mumble as a YunoHost service -yunohost service add $app --description="Mumble server" --log="/var/log/$app/$app.log" +yunohost service add $app --description="Mumble server" --log="/var/log/$app/$app.log" --needs_exposed_ports $port #================================================= # RESTORE SYSTEMD #================================================= +ynh_script_progression --message="Restoring the systemd configuration..." --weight=1 -ynh_restore_file "/etc/systemd/system/$app.service" -systemctl enable "$app.service" --quiet +ynh_restore_file --origin_path="/etc/systemd/system/$app.service" +systemctl enable $app.service --quiet -systemctl restart "$app" +#================================================= +# START SYSTEMD SERVICE +#================================================= +ynh_script_progression --message="Starting a systemd service..." --weight=3 + +ynh_systemd_action --service_name=$app --action=restart #--log_path="/var/log/$app/$app.log" #================================================= # END OF SCRIPT #================================================= ynh_script_progression --message="Restoration completed for $app" --last - diff --git a/scripts/upgrade b/scripts/upgrade index dc094e3..8f939a2 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -13,6 +13,7 @@ source /usr/share/yunohost/helpers # LOAD SETTINGS #================================================= ynh_script_progression --message="Loading installation settings..." --weight=1 + app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get --app=$app --key=domain) @@ -34,6 +35,7 @@ upgrade_type=$(ynh_check_app_version_changed) #================================================= # ENSURE DOWNWARD COMPATIBILITY #================================================= +ynh_script_progression --message="Ensuring downward compatibility..." --weight=1 # If final_path doesn't exist, create it if [ -z "$final_path" ]; then @@ -124,7 +126,7 @@ ynh_abort_if_errors ynh_script_progression --message="Upgrading dependencies..." --weight=6 # Install Mumble Debian package via apt -ynh_install_app_dependencies $pkg_dependencies +ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies #================================================= # SPECIFIC UPGRADE @@ -154,6 +156,7 @@ ynh_store_file_checksum "$mumble_conf" #================================================= # SETUP SYSTEMD #================================================= +ynh_script_progression --message="Upgrading systemd configuration..." --weight=2 # Create a dedicated systemd config ynh_add_systemd_config @@ -193,9 +196,14 @@ systemctl disable mumble-server --quiet #================================================= # Add Mumble as a YunoHost service -yunohost service add $app --description="Mumble server" --log="/var/log/$app/$app.log" +yunohost service add $app --description="Mumble server" --log="/var/log/$app/$app.log" --needs_exposed_ports $port -systemctl restart "$app" +#================================================= +# START SYSTEMD SERVICE +#================================================= +ynh_script_progression --message="Starting a systemd service..." --weight=3 + +ynh_systemd_action --service_name=$app --action=restart #--log_path="/var/log/$app/$app.log" #================================================= # SEND README TO ADMIN