From db8a3edf0402febbb9e65c7147ca571febd90b01 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 6 Dec 2020 22:27:53 +0100 Subject: [PATCH] Fix linter warnings --- check_process | 3 --- manifest.json | 6 +++--- scripts/backup | 11 ++++++----- scripts/change_url | 14 +++++++------- scripts/install | 6 +++--- scripts/remove | 4 ++-- scripts/restore | 2 +- scripts/upgrade | 7 ------- 8 files changed, 22 insertions(+), 31 deletions(-) diff --git a/check_process b/check_process index ed5871d..b02e0ff 100644 --- a/check_process +++ b/check_process @@ -14,11 +14,8 @@ upgrade=1 from_commit=f6565f66d82fa077d752226f8b8267018f7b91d8 backup_restore=1 multi_instance=1 - incorrect_path=1 port_already_use=0 change_url=1 -;;; Levels - Level 5=auto ;;; Options Email=ljf+ynh-strut@grimaud.me Notification=down diff --git a/manifest.json b/manifest.json index 80ee397..25da469 100644 --- a/manifest.json +++ b/manifest.json @@ -2,11 +2,11 @@ "name": "Strut", "id": "strut", "packaging_format": 1, - "version": "20171224-1~ynh1", + "version": "20171224-1~ynh2", "url": "http://strut.io", "license": "AGPL-3.0", "requirements": { - "yunohost": ">= 3.5.0" + "yunohost": ">= 3.8.1" }, "description": { "en": "Slide editor for creating impress.js presentations.", @@ -45,7 +45,7 @@ "name": "is_public", "type": "boolean", "ask": { - "en": "Could non member create presentations ?", + "en": "Could non member create presentations?", "fr": "Une personne non membre peut elle créer une présentation ?" }, "default": true diff --git a/scripts/backup b/scripts/backup index deda952..d40b17f 100644 --- a/scripts/backup +++ b/scripts/backup @@ -19,7 +19,7 @@ ynh_abort_if_errors #================================================= # LOAD SETTINGS #================================================= -ynh_script_progression --message="Loading installation settings..." --weight=2 +ynh_print_info --message="Loading installation settings..." app=$YNH_APP_INSTANCE_NAME @@ -27,18 +27,19 @@ domain=$(ynh_app_setting_get --app=$app --key=domain) final_path=$(ynh_app_setting_get --app=$app --key=final_path) #================================================= -# STANDARD BACKUP STEPS +# DECLARE DATA AND CONF FILES TO BACKUP +#================================================= +ynh_print_info --message="Declaring files to be backed up..." + #================================================= # BACKUP THE APP MAIN DIR #================================================= -ynh_script_progression --message="Backing up the main app directory..." ynh_backup --src_path="$final_path" #================================================= # BACKUP THE NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Backing up nginx web server configuration..." ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" @@ -46,4 +47,4 @@ ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" # END OF SCRIPT #================================================= -ynh_script_progression --message="Backup script completed for $app. (YunoHost will then actually copy those files to the archive)." --last +ynh_print_info --message="Backup script completed for $app. (YunoHost will then actually copy those files to the archive)." diff --git a/scripts/change_url b/scripts/change_url index 716c7e7..0060203 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -50,23 +50,23 @@ fi #================================================= # MODIFY URL IN NGINX CONF #================================================= -ynh_script_progression --message="Updating nginx web server configuration..." --weight=2 +ynh_script_progression --message="Updating NGINX web server configuration..." --weight=2 nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf -# Change the path in the nginx config file +# Change the path in the NGINX config file if [ $change_path -eq 1 ] then - # Make a backup of the original nginx config file if modified + # Make a backup of the original NGINX config file if modified ynh_backup_if_checksum_is_different --file="$nginx_conf_path" - # Set global variables for nginx helper + # Set global variables for NGINX helper domain="$old_domain" path_url="$new_path" - # Create a dedicated nginx config + # Create a dedicated NGINX config ynh_add_nginx_config fi -# Change the domain for nginx +# Change the domain for NGINX if [ $change_domain -eq 1 ] then # Delete file checksum for the old conf file location @@ -81,7 +81,7 @@ fi #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading nginx web server..." +ynh_script_progression --message="Reloading NGINX web server..." ynh_systemd_action --service_name=nginx --action=reload diff --git a/scripts/install b/scripts/install index 0165f1c..2f026ad 100644 --- a/scripts/install +++ b/scripts/install @@ -65,9 +65,9 @@ ynh_secure_remove --file="$tmp_dir" #================================================= # NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Configuring nginx web server..." --weight=4 +ynh_script_progression --message="Configuring NGINX web server..." --weight=4 -# Create a dedicated nginx config +# Create a dedicated NGINX config ynh_add_nginx_config #================================================= @@ -105,7 +105,7 @@ fi #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading nginx web server..." +ynh_script_progression --message="Reloading NGINX web server..." ynh_systemd_action --service_name=nginx --action=reload diff --git a/scripts/remove b/scripts/remove index 2ac0895..af1284c 100644 --- a/scripts/remove +++ b/scripts/remove @@ -32,9 +32,9 @@ ynh_secure_remove --file="$final_path" #================================================= # REMOVE NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Removing nginx web server configuration..." +ynh_script_progression --message="Removing NGINX web server configuration..." -# Remove the dedicated nginx config +# Remove the dedicated NGINX config ynh_remove_nginx_config #================================================= diff --git a/scripts/restore b/scripts/restore index f3af36e..13aa9e5 100644 --- a/scripts/restore +++ b/scripts/restore @@ -66,7 +66,7 @@ find "$final_path" -type d -print0 | xargs -0 chmod 750 #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading nginx web server..." +ynh_script_progression --message="Reloading NGINX web server..." ynh_systemd_action --service_name=nginx --action=reload diff --git a/scripts/upgrade b/scripts/upgrade index 27f6196..9be6c06 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -65,13 +65,6 @@ ynh_clean_setup () { # Exit if an error occurs during the execution of the script ynh_abort_if_errors -#================================================= -# CHECK THE PATH -#================================================= - -# Normalize the URL path syntax -path_url=$(ynh_normalize_url_path --path_url=$path_url) - #================================================= # STANDARD UPGRADE STEPS #=================================================