From df00768c3710a3be9eb09f4cfc170f2711e29682 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 14 Dec 2020 10:34:54 +0100 Subject: [PATCH] Fix linter warnings --- check_process | 2 -- manifest.json | 6 +++++- scripts/install | 2 +- scripts/remove | 2 +- scripts/restore | 4 ++-- scripts/upgrade | 9 +-------- 6 files changed, 10 insertions(+), 15 deletions(-) diff --git a/check_process b/check_process index 5800f60..ee1a894 100644 --- a/check_process +++ b/check_process @@ -16,8 +16,6 @@ multi_instance=0 port_already_use=1 change_url=1 -;;; Levels - Level 5=auto ;;; Options Email= Notification=none diff --git a/manifest.json b/manifest.json index 9fb931a..82603b9 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Open-source pastebin allowing to upload texts", "fr": "Pastebin open-source permettant de mettre en ligne du texte" }, - "version": "0.1.0~ynh3", + "version": "0.1.0~ynh4", "url": "https://github.com/seejohnrun/haste-server", "license": "MIT", "maintainer": { @@ -48,6 +48,10 @@ "en": "Is it a public site? (you won't be able to use Haste command easily if not)", "fr": "Est-ce un site publique ? (si non, vous ne pourrez pas utiliser la commande Haste facilement)" }, + "help": { + "en": "If enabled, Haste will be accessible by people who do not have an account. This can be changed later via the webadmin.", + "fr": "Si cette case est cochée, Haste sera accessible aux personnes n’ayant pas de compte. Vous pourrez changer ceci plus tard via la webadmin." + }, "default": true } ] diff --git a/scripts/install b/scripts/install index 5bf3377..b1e72a9 100755 --- a/scripts/install +++ b/scripts/install @@ -174,7 +174,7 @@ ynh_use_logrotate # INTEGRATE SERVICE IN YUNOHOST #================================================= -yunohost service add $app --description "Haste is an open-source pastebin software" --log "/var/log/$app/$app.log" +yunohost service add $app --description="Haste is an open-source pastebin software" --log="/var/log/$app/$app.log" #================================================= # START SYSTEMD SERVICE diff --git a/scripts/remove b/scripts/remove index 4897edc..8ea90bb 100755 --- a/scripts/remove +++ b/scripts/remove @@ -25,7 +25,7 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path) # REMOVE SERVICE INTEGRATION IN YUNOHOST #================================================= -# Remove the service from the list of services known by Yunohost (added from `yunohost service add`) +# 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 ynh_script_progression --message="Removing $app service integration..." --weight=1 diff --git a/scripts/restore b/scripts/restore index f2cff50..e385747 100755 --- a/scripts/restore +++ b/scripts/restore @@ -101,7 +101,7 @@ chown $app -R /var/log/$app # INTEGRATE SERVICE IN YUNOHOST #================================================= -yunohost service add $app --description "Haste is an open-source pastebin software" --log "/var/log/$app/$app.log" +yunohost service add $app --description="Haste is an open-source pastebin software" --log="/var/log/$app/$app.log" #================================================= # RESTORE SYSTEMD @@ -109,7 +109,7 @@ yunohost service add $app --description "Haste is an open-source pastebin softwa ynh_script_progression --message="Restoring the systemd configuration..." --weight=2 ynh_restore_file --origin_path="/etc/systemd/system/$app.service" -systemctl enable $app.service +systemctl enable $app.service --quiet #================================================= # START SYSTEMD SERVICE diff --git a/scripts/upgrade b/scripts/upgrade index 56e241a..4217ab9 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -61,13 +61,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 #================================================= @@ -186,7 +179,7 @@ chmod +x /usr/bin/$app # INTEGRATE SERVICE IN YUNOHOST #================================================= -yunohost service add $app --description "Haste is an open-source pastebin software" --log "/var/log/$app/$app.log" +yunohost service add $app --description="Haste is an open-source pastebin software" --log="/var/log/$app/$app.log" #================================================= # START SYSTEMD SERVICE