From e41c919ddb65673ea6b452e138d36c240be3b6b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 7 Feb 2021 21:43:58 +0100 Subject: [PATCH] Testing (#43) * Upgrade to 040.0 --- README.md | 2 +- README_fr.md | 2 +- conf/arm64.src | 4 ++-- conf/armv5.src | 4 ++-- conf/armv6.src | 4 ++-- conf/armv7.src | 4 ++-- conf/i386.src | 4 ++-- conf/x86-64.src | 4 ++-- manifest.json | 2 +- pull_request_template.md | 4 ++++ scripts/change_url | 4 ++-- scripts/install | 6 +++--- scripts/restore | 2 +- scripts/upgrade | 14 +++++++++++++- 14 files changed, 38 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index d25777f..3885925 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Overview Navidrome is an open source web-based music collection server and streamer. It gives you freedom to listen to your music collection from any browser or mobile device. -**Shipped version:** 0.39.0 +**Shipped version:** 0.40.0 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 21b1bbb..5becdc5 100644 --- a/README_fr.md +++ b/README_fr.md @@ -11,7 +11,7 @@ Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/#/install ## Vue d'ensemble Navidrome est un serveur et un streamer de collection de musique en ligne open source. Il vous donne la liberté d'écouter votre playlist à partir de n'importe quel navigateur ou appareil mobile. -**Version incluse :** 0.39.0 +**Version incluse :** 0.40.0 ## Captures d'écran diff --git a/conf/arm64.src b/conf/arm64.src index 893c2ac..e6e4c31 100644 --- a/conf/arm64.src +++ b/conf/arm64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.39.0/navidrome_0.39.0_Linux_arm64.tar.gz -SOURCE_SUM=f54ebe5401f92c856c24a6085192c01c6db4a07819ed680bc758765da56fe4c4 +SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.40.0/navidrome_0.40.0_Linux_arm64.tar.gz +SOURCE_SUM=136505badfd5ffff5b54a1a6c4188625b63d9b72bcd35fe1612f0c669762e7c7 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/conf/armv5.src b/conf/armv5.src index 08d53bb..27809b9 100644 --- a/conf/armv5.src +++ b/conf/armv5.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.39.0/navidrome_0.39.0_Linux_armv5.tar.gz -SOURCE_SUM=ad705440b8d0fd27cda76e7865e74c5d79c4e1cdb24b43b47d189b6cce04e90d +SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.40.0/navidrome_0.40.0_Linux_armv5.tar.gz +SOURCE_SUM=b14ffc330eb9f93ca4abc75b1758ef88e62dd7fd878c917abe9c3c496d5737d6 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/conf/armv6.src b/conf/armv6.src index 146a2b2..1ed3f05 100644 --- a/conf/armv6.src +++ b/conf/armv6.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.39.0/navidrome_0.39.0_Linux_armv6.tar.gz -SOURCE_SUM=516f06fc69de2954b624a2ae39ce1ee2a8bf8ba253ccb6ca4c24234375e2189c +SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.40.0/navidrome_0.40.0_Linux_armv6.tar.gz +SOURCE_SUM=83ee2aeff3a52823aca91755c9aac92d8988e85c31203d9da869df3362c70b2f SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/conf/armv7.src b/conf/armv7.src index 9485033..d211aa6 100644 --- a/conf/armv7.src +++ b/conf/armv7.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.39.0/navidrome_0.39.0_Linux_armv7.tar.gz -SOURCE_SUM=a61d30e13889802b72e1d41c8a7aff7dede5c14d52b20bfab0c912fa1b4fe3e2 +SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.40.0/navidrome_0.40.0_Linux_armv7.tar.gz +SOURCE_SUM=fbc8f319bea31fa8280f2a7275cb1f44a85baaab0623ced203d323acaaaa58c3 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/conf/i386.src b/conf/i386.src index 80cae17..03ff528 100644 --- a/conf/i386.src +++ b/conf/i386.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.39.0/navidrome_0.39.0_Linux_i386.tar.gz -SOURCE_SUM=4ff969fe002591258c952b1e9ae16e33a5c09e8e1d2ff721dc7fcbcc77e0a09b +SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.40.0/navidrome_0.40.0_Linux_i386.tar.gz +SOURCE_SUM=6f8389326e2699c4ec22fb7430d64bc301a4bceba98e09ecc8e19a378411ffaf SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/conf/x86-64.src b/conf/x86-64.src index f35335a..a6b1a33 100644 --- a/conf/x86-64.src +++ b/conf/x86-64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.39.0/navidrome_0.39.0_Linux_x86_64.tar.gz -SOURCE_SUM=9639326166140e9899753fd31ca36e144b2d40bcdb582ded06b476d4d2a2f859 +SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.40.0/navidrome_0.40.0_Linux_x86_64.tar.gz +SOURCE_SUM=b01213087ca38b9e4e9e8a4d94308dca949ffe3f0b2ad6ab4863d8cf97d0672b SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/manifest.json b/manifest.json index fd2f47d..a05b2b7 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Modern Music Server and Streamer compatible with Subsonic/Airsonic", "fr": "Serveur de musique moderne et Streamer compatibles avec Subsonic/Airsonic" }, - "version": "0.39.0~ynh2", + "version": "0.40.0~ynh1", "url": "https://github.com/deluan/navidrome/", "license": "GPL-3.0-only", "maintainer": { diff --git a/pull_request_template.md b/pull_request_template.md index 69ce5a0..6c28fc5 100644 --- a/pull_request_template.md +++ b/pull_request_template.md @@ -10,3 +10,7 @@ - [ ] Fix or enhancement tested. - [ ] Upgrade from last version tested. - [ ] Can be reviewed and tested. + +## Package_check results +--- +* An automatic package_check will be launch at https://ci-apps-dev.yunohost.org/, when you add a specific comment to your Pull Request: "!testme", "!gogogadgetoci" or "By the power of systemd, I invoke The Great App CI to test this Pull Request!"* diff --git a/scripts/change_url b/scripts/change_url index 1a815e9..69455b1 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -70,7 +70,7 @@ fi #================================================= ynh_script_progression --message="Stopping a systemd service..." --weight=1 -ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app/$app.log" +ynh_systemd_action --service_name=$app --action=stop --log_path="/var/log/$app/$app.log" #================================================= # MODIFY URL IN NGINX CONF @@ -126,7 +126,7 @@ ynh_store_file_checksum --file="$config_path/navidrome.toml" ynh_script_progression --message="Starting a systemd service..." --weight=1 # Start a systemd service -ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --line_match="Version:" +ynh_systemd_action --service_name=$app --action=start --log_path=systemd --line_match="Version:" #================================================= # RELOAD NGINX diff --git a/scripts/install b/scripts/install index f10411f..a336505 100644 --- a/scripts/install +++ b/scripts/install @@ -153,17 +153,17 @@ yunohost service add $app --description "Web-based music collection server and s ynh_script_progression --message="Starting a systemd service..." --weight=2 # Start a systemd service -ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --line_match="Version:" +ynh_systemd_action --service_name=$app --action=start --log_path=systemd --line_match="Version:" #================================================= # SETUP SSOWAT #================================================= -ynh_script_progression --message="Configuring SSOwat..." --weight=1 +ynh_script_progression --message="Configuring permissions..." --weight=1 # Make app public if necessary or protect it if [ $is_public -eq 1 ] then - ynh_permission_update --permission "main" --add "visitors" + ynh_permission_update --permission="main" --add="visitors" fi #================================================= diff --git a/scripts/restore b/scripts/restore index 51ede62..bdeed66 100644 --- a/scripts/restore +++ b/scripts/restore @@ -110,7 +110,7 @@ yunohost service add $app --description "Web-based music collection server and s #================================================= ynh_script_progression --message="Starting a systemd service..." --weight=1 -ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --line_match="Version:" +ynh_systemd_action --service_name=$app --action=start --log_path=systemd --line_match="Version:" #================================================= # GENERIC FINALIZATION diff --git a/scripts/upgrade b/scripts/upgrade index b2a525e..17ae65a 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -30,6 +30,18 @@ ynh_script_progression --message="Checking version..." upgrade_type=$(ynh_check_app_version_changed) +#================================================= +# ENSURE DOWNWARD COMPATIBILITY +#================================================= +ynh_script_progression --message="Ensuring downward compatibility..." --weight=1 + +# Cleaning legacy permissions +if ynh_legacy_permissions_exists; then + ynh_legacy_permissions_delete_all + + ynh_app_setting_delete --app=$app --key=is_public +fi + #================================================= # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP #================================================= @@ -51,7 +63,7 @@ ynh_abort_if_errors #================================================= ynh_script_progression --message="Stopping a systemd service..." --weight=1 -ynh_systemd_action --service_name=$app --action="stop" --log_path="systemd" +ynh_systemd_action --service_name=$app --action=stop --log_path=systemd #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE