From b7d0141eb2c06a1db598d925f20199b63ab299c4 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 5 Apr 2021 23:56:26 +0200 Subject: [PATCH] Fix linter --- scripts/_common.sh | 2 +- scripts/change_url | 2 +- scripts/install | 4 ++-- scripts/upgrade | 10 ---------- 4 files changed, 4 insertions(+), 14 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 2dd4586..5a99575 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,7 +4,7 @@ # COMMON VARIABLES #================================================= # dependencies used by the app -pkg_dependencies="build-essential python3-dev python3-pip python3-venv git postgresql postgresql-contrib \ +pkg_dependencies="acl build-essential python3-dev python3-pip python3-venv git postgresql postgresql-contrib \ gir1.2-gst-plugins-base-1.0 gir1.2-gstreamer-1.0 gstreamer1.0-plugins-good gstreamer1.0-plugins-ugly lsb-base \ python3-gst-1.0 python3-tornado (>= 4.4) debconf python3-pkg-resources python3-pykka python3-requests \ gstreamer1.0-alsa gstreamer1.0-pulseaudio gstreamer1.0-tools" diff --git a/scripts/change_url b/scripts/change_url index 45a28e6..17c0993 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -105,8 +105,8 @@ then ynh_permission_url --permission="main" --add_url="$new_domain/mopidy/ws" --remove_url="$old_domain/mopidy/ws" ynh_permission_url --permission="main" --add_url="$new_domain/local" --remove_url="$old_domain/local" ynh_permission_url --permission="main" --add_url="$new_domain/musicbox_webclient" --remove_url="$old_domain/musicbox_webclient" - fi + #================================================= # SPECIFIC MODIFICATIONS #================================================= diff --git a/scripts/install b/scripts/install index 346e3a8..21a7578 100755 --- a/scripts/install +++ b/scripts/install @@ -102,7 +102,7 @@ ynh_add_nginx_config #================================================= # CREATE YUNOHOST DIRECTORIES #================================================= -ynh_script_progression --message="Creating yunohost directories..." +ynh_script_progression --message="Creating YunoHost directories..." ynh_multimedia_build_main_dir # /home/yunohost.multimedia @@ -186,7 +186,7 @@ ynh_systemd_action --service_name=nginx --action=reload #================================================= # PROVIDE ADDITIONAL SHELL COMAND #================================================= -ynh_script_progression --message="Provide additional shell comand..." +ynh_script_progression --message="Provide additional shell command..." cp -a ../sources/extra_files/mopidyctl "$cmd_file" ynh_replace_string --match_string="__APP__" --replace_string=$app --target_file="$cmd_file" diff --git a/scripts/upgrade b/scripts/upgrade index 8061c26..f8c8ad5 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -27,17 +27,10 @@ work_dir="/home/yunohost.app/$app" conf_file="$final_path/$app.conf" cmd_file="/usr/local/bin/mopidyctl" - #================================================= # CHECK VERSION #================================================= -### This helper will compare the version of the currently installed app and the version of the upstream package. -### $upgrade_type can have 2 different values -### - UPGRADE_APP if the upstream app version has changed -### - UPGRADE_PACKAGE if only the YunoHost package has changed -### ynh_check_app_version_changed will stop the upgrade if the app is up to date. -### UPGRADE_APP should be used to upgrade the core app only if there's an upgrade to do. upgrade_type=$(ynh_check_app_version_changed) #================================================= @@ -127,11 +120,8 @@ ynh_add_systemd_config --others_var="conf_file start_file" # substitute __CO # MODIFY A CONFIG FILE #================================================= -### Verify the checksum of a file, stored by `ynh_store_file_checksum` in the install script. -### And create a backup of this file if the checksum is different. So the file will be backed up if the admin had modified it. ynh_backup_if_checksum_is_different --file="$conf_file" - cp ../conf/app.conf "$conf_file" ynh_replace_string --match_string="__PORT__" --replace_string=$port --target_file="$conf_file"