From 41acabbcce6a98301ae88c3047620ddc2404f285 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 31 Dec 2020 14:42:41 +0100 Subject: [PATCH] Fix linter warnings --- manifest.json | 2 +- scripts/_common.sh | 2 +- scripts/install | 8 ++++---- scripts/restore | 14 +++++++------- scripts/upgrade | 12 ++++++------ 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/manifest.json b/manifest.json index df7bf02..2510f5c 100644 --- a/manifest.json +++ b/manifest.json @@ -10,7 +10,7 @@ "url": "https://github.com/mengshukeji/Luckysheet", "license": "MIT", "maintainer": { - "name": "" + "name": "eric_G" }, "requirements": { "yunohost": ">= 3.8.1" diff --git a/scripts/_common.sh b/scripts/_common.sh index ac79128..7912aa4 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,7 +4,7 @@ # COMMON VARIABLES #================================================= -nodejs_version=12 +nodejs_version=14 #================================================= # PERSONAL HELPERS diff --git a/scripts/install b/scripts/install index cacaa7d..d338146 100644 --- a/scripts/install +++ b/scripts/install @@ -129,17 +129,17 @@ ynh_add_systemd_config #================================================= # SECURE FILES AND DIRECTORIES #================================================= -ynh_script_progression --message="Securing files and directories..." +ynh_script_progression --message="Securing files and directories..." --weight=1 # Set permissions to app files -chown -R $app:$app $final_path +chown -R $app: $final_path #================================================= # INTEGRATE SERVICE IN YUNOHOST #================================================= -ynh_script_progression --message="Integrating service in YunoHost..." +ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 -yunohost service add $app --description "Collaborative Markdown notes" --log="/var/log/$app/$app.log" +yunohost service add $app --description="Online spreadsheet like excel" --log="/var/log/$app/$app.log" #================================================= # START SYSTEMD SERVICE diff --git a/scripts/restore b/scripts/restore index a7219c5..6bc0c0f 100644 --- a/scripts/restore +++ b/scripts/restore @@ -45,14 +45,14 @@ test ! -d $final_path \ #================================================= # RESTORE THE NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Restoring the NGINX configuration..." +ynh_script_progression --message="Restoring the NGINX configuration..." --weight=1 ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" #================================================= # RESTORE THE APP MAIN DIR #================================================= -ynh_script_progression --message="Restoring Luckysheet main directory..." --weight=60 +ynh_script_progression --message="Restoring Luckysheet main directory..." --weight=50 ynh_restore_file --origin_path="$final_path" @@ -67,10 +67,10 @@ ynh_system_user_create --username=$app #================================================= # RESTORE USER RIGHTS #================================================= -ynh_script_progression --message="Restoring user rights..." +ynh_script_progression --message="Restoring user rights..." --weight=1 # Restore permissions on app files -chown -R $app:$app $final_path +chown -R $app: $final_path #================================================= # SPECIFIC RESTORATION @@ -88,14 +88,14 @@ ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version ynh_script_progression --message="Restoring the systemd configuration..." --weight=5 ynh_restore_file --origin_path="/etc/systemd/system/$app.service" -systemctl enable $app.service +systemctl enable $app.service --quiet #================================================= # INTEGRATE SERVICE IN YUNOHOST #================================================= -ynh_script_progression --message="Integrating service in YunoHost..." +ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 -yunohost service add $app --description "collaborative Markdown editor" --log "/var/log/$app/$app.log" +yunohost service add $app --description="Online spreadsheet like excel" --log="/var/log/$app/$app.log" #================================================= # START SYSTEMD SERVICE diff --git a/scripts/upgrade b/scripts/upgrade index 66b9880..8bb7200 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -32,7 +32,7 @@ upgrade_type=$(ynh_check_app_version_changed) #================================================= # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP #================================================= -ynh_script_progression --message="Backing up Luckysheet before upgrading (may take a while)..." --weight=120 +ynh_script_progression --message="Backing up Luckysheet before upgrading (may take a while)..." --weight=20 # Backup the current version of the app ynh_backup_before_upgrade @@ -58,7 +58,7 @@ ynh_systemd_action --service_name=$app --action="stop" --log_path="systemd" if [ "$upgrade_type" == "UPGRADE_APP" ] then - ynh_script_progression --message="Upgrading source files..." --weight=160 + ynh_script_progression --message="Upgrading source files..." --weight=20 # Remove the app directory securely ynh_secure_remove --file=$final_path @@ -98,7 +98,7 @@ ynh_system_user_create --username=$app #============================================== if [ "$upgrade_type" == "UPGRADE_APP" ] then - ynh_script_progression --message="Building Luckysheet... (this will take some time and resources!)" --weight=160 + ynh_script_progression --message="Building Luckysheet... (this will take some time and resources!)" --weight=20 pushd "$final_path" || ynh_die @@ -124,17 +124,17 @@ ynh_add_systemd_config #================================================= # SECURE FILES AND DIRECTORIES #================================================= -ynh_script_progression --message="Securing files and directories..." +ynh_script_progression --message="Securing files and directories..." --weight=1 # Set permissions on app files -chown -R $app:$app $final_path +chown -R $app: $final_path #================================================= # INTEGRATE SERVICE IN YUNOHOST #================================================= ynh_script_progression --message="Integrating service in YunoHost..." -yunohost service add $app --description "Collaborative Markdown notes" --log="/var/log/$app/$app.log" +yunohost service add $app --description="Online spreadsheet like excel" --log="/var/log/$app/$app.log" #================================================= # START SYSTEMD SERVICE