From 33d5e1cd3207f167684d80584a7173e9af88a35a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 7 Oct 2021 12:52:59 +0200 Subject: [PATCH] 0.46.0 (#67) * 0.46.0 --- .github/workflows/updater.sh | 6 ------ .github/workflows/updater.yml | 1 + README.md | 3 +-- README_fr.md | 3 +-- conf/arm64.src | 6 +++--- conf/armv5.src | 6 +++--- conf/armv6.src | 6 +++--- conf/armv7.src | 6 +++--- conf/i386.src | 5 ----- conf/x86-64.src | 5 ++--- manifest.json | 3 +-- scripts/_common.sh | 4 +--- scripts/backup | 3 --- scripts/install | 3 --- scripts/restore | 3 --- scripts/upgrade | 1 - 16 files changed, 19 insertions(+), 45 deletions(-) delete mode 100644 conf/i386.src diff --git a/.github/workflows/updater.sh b/.github/workflows/updater.sh index dbc541d..cda04b4 100644 --- a/.github/workflows/updater.sh +++ b/.github/workflows/updater.sh @@ -75,9 +75,6 @@ case $asset_url in navidrome_"*"_Linux_arm64.tar.gz navidrome_"*"_Linux_armv7.tar.gz) src="armv7" ;; - navidrome_"*"_Linux_i386.tar.gz) - src="i386" - ;; navidrome_"*"_Linux_x86_64.tar.gz) src="x86-64" ;; @@ -131,9 +128,6 @@ done # GENERIC FINALIZATION #================================================= -# Install moreutils, needed for sponge -sudo apt-get install moreutils - # Replace new version in manifest echo "$(jq -s --indent 4 ".[] | .version = \"$version~ynh1\"" manifest.json)" > manifest.json diff --git a/.github/workflows/updater.yml b/.github/workflows/updater.yml index ca77fed..fd6ed60 100644 --- a/.github/workflows/updater.yml +++ b/.github/workflows/updater.yml @@ -41,6 +41,7 @@ jobs: author: 'yunohost-bot ' signoff: false branch: ci-auto-update-v${{ env.VERSION }} + base: testing delete-branch: true title: 'Upgrade to version ${{ env.VERSION }}' body: | diff --git a/README.md b/README.md index 6d3c487..a44959f 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Navidrome a software that allows you to listen to your own digital music in the same way you would with services like Spotify, Apple Music and others. It also allows you to easily share your music and playlists with your friends and family.s Navidrome indexes all digital music stored in your hard drive and makes it available through a nice web player and also by using any Subsonic-API compatible mobile client. Your music becomes searchable and you can create playlists, rate and “favourite” your loved tracks, albums and artists -**Shipped version:** 0.45.1~ynh1 +**Shipped version:** 0.46.0~ynh1 **Demo:** https://demo.navidrome.org/app/#/login @@ -43,7 +43,6 @@ You must activate *public site* if you want to connect a client player to Navidr ## Documentation and resources * Official app website: https://www.navidrome.org -* Official user documentation: https://yunohost.org/en/app_navidrome * Official admin documentation: https://www.navidrome.org/docs * Upstream app code repository: https://github.com/deluan/navidrome * YunoHost documentation for this app: https://yunohost.org/app_navidrome diff --git a/README_fr.md b/README_fr.md index 3f72b70..16f6a40 100644 --- a/README_fr.md +++ b/README_fr.md @@ -15,7 +15,7 @@ Navidrome un logiciel qui vous permet d'écouter votre propre musique numérique Navidrome indexe toute la musique numérique stockée sur votre disque dur et la rend disponible via un agréable lecteur Web et également en utilisant n'importe quel client mobile compatible Subsonic-API. Votre musique devient consultable et vous pouvez créer des listes de lecture, évaluer et « favori » vos morceaux, albums et artistes préférés -**Version incluse :** 0.45.1~ynh1 +**Version incluse :** 0.46.0~ynh1 **Démo :** https://demo.navidrome.org/app/#/login @@ -40,7 +40,6 @@ Vous devez activer *site public* si vous souhaitez connecter un lecteur client ## Documentations et ressources * Site officiel de l'app : https://www.navidrome.org -* Documentation officielle utilisateur : https://yunohost.org/en/app_navidrome * Documentation officielle de l'admin : https://www.navidrome.org/docs * Dépôt de code officiel de l'app : https://github.com/deluan/navidrome * Documentation YunoHost pour cette app : https://yunohost.org/app_navidrome diff --git a/conf/arm64.src b/conf/arm64.src index ead7b20..1b07b2d 100644 --- a/conf/arm64.src +++ b/conf/arm64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.45.1/navidrome_0.45.1_Linux_arm64.tar.gz -SOURCE_SUM=55ad034a67a68fc86c6b2c283fa58aa3fc7e410cd23701c2a54e155ace65a5b2 +SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.46.0/navidrome_0.46.0_Linux_arm64.tar.gz +SOURCE_SUM=2a6e7c04c7369e0bfa08ba9790da432310be9c56ff7dbbf3ee2045d3fc4d72c5 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz -SOURCE_IN_SUBDIR=false \ No newline at end of file +SOURCE_IN_SUBDIR=false diff --git a/conf/armv5.src b/conf/armv5.src index 73eff29..93f6243 100644 --- a/conf/armv5.src +++ b/conf/armv5.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.45.1/navidrome_0.45.1_Linux_armv5.tar.gz -SOURCE_SUM=c73cdc0418d120ccd95a95c50a3b925bad5a8c76922074eccecdd1c1596e41a7 +SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.46.0/navidrome_0.46.0_Linux_armv5.tar.gz +SOURCE_SUM=9ffe050c91d0504b472f894ec73ceb95e2c1bc57e83df2e75d6cb8e17d0587eb SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz -SOURCE_IN_SUBDIR=false \ No newline at end of file +SOURCE_IN_SUBDIR=false diff --git a/conf/armv6.src b/conf/armv6.src index d175240..76dcc86 100644 --- a/conf/armv6.src +++ b/conf/armv6.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.45.1/navidrome_0.45.1_Linux_armv6.tar.gz -SOURCE_SUM=49b752ef6b7078b0ae12e6b8ef5aa936abc3cba26499aa4ea6aea448aa9053c8 +SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.46.0/navidrome_0.46.0_Linux_armv6.tar.gz +SOURCE_SUM=653d07d94d6add4dcce09204578167ff9a94c828298f43fc9a16943cf819f14f SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz -SOURCE_IN_SUBDIR=false \ No newline at end of file +SOURCE_IN_SUBDIR=false diff --git a/conf/armv7.src b/conf/armv7.src index 115b2b3..3d4ec16 100644 --- a/conf/armv7.src +++ b/conf/armv7.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.45.1/navidrome_0.45.1_Linux_armv7.tar.gz -SOURCE_SUM=baa86452c8d7a48d67145b22eb4fcfa56042172dc4a9f1d3a2328b7d2076e7d1 +SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.46.0/navidrome_0.46.0_Linux_armv7.tar.gz +SOURCE_SUM=8cb14112f49f32fde66e8d7da8651d6b7f1304106707428902a20292f8b529de SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz -SOURCE_IN_SUBDIR=false \ No newline at end of file +SOURCE_IN_SUBDIR=false diff --git a/conf/i386.src b/conf/i386.src deleted file mode 100644 index 06e56a1..0000000 --- a/conf/i386.src +++ /dev/null @@ -1,5 +0,0 @@ -SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.45.1/navidrome_0.45.1_Linux_i386.tar.gz -SOURCE_SUM=e9615dc5574c5368c3a0ea457277b8ed35df737de9a2e9f46b0c3934864928c2 -SOURCE_SUM_PRG=sha256sum -SOURCE_FORMAT=tar.gz -SOURCE_IN_SUBDIR=false \ No newline at end of file diff --git a/conf/x86-64.src b/conf/x86-64.src index 6e4c4de..396468c 100644 --- a/conf/x86-64.src +++ b/conf/x86-64.src @@ -1,6 +1,5 @@ -SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.45.1/navidrome_0.45.1_Linux_x86_64.tar.gz -SOURCE_SUM=4d9717ab9d6c2a878b3e6711a6fe1520b0e64ba76c4bb971949cd30c7d2d1163 +SOURCE_URL=https://github.com/deluan/navidrome/releases/download/v0.46.0/navidrome_0.46.0_Linux_x86_64.tar.gz +SOURCE_SUM=6da0524199e5702e73abbc0a59b89af3110ca99b828249ffcf2416c2d7c79ffc SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false -SOURCE_FILENAME= \ No newline at end of file diff --git a/manifest.json b/manifest.json index b3f1b2d..38e6a08 100644 --- a/manifest.json +++ b/manifest.json @@ -6,14 +6,13 @@ "en": "Modern Music Server and Streamer compatible with Subsonic/Airsonic", "fr": "Serveur de musique moderne et Streamer compatibles avec Subsonic/Airsonic" }, - "version": "0.45.1~ynh1", + "version": "0.46.0~ynh1", "url": "https://www.navidrome.org", "upstream": { "license": "GPL-3.0-only", "website": "https://www.navidrome.org", "demo": "https://demo.navidrome.org/app/#/login", "admindoc": "https://www.navidrome.org/docs", - "userdoc": "https://yunohost.org/en/app_navidrome", "code": "https://github.com/deluan/navidrome" }, "license": "GPL-3.0-only", diff --git a/scripts/_common.sh b/scripts/_common.sh index 5e393bf..b4b81b0 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -29,9 +29,7 @@ pkg_dependencies="ffmpeg" ynh_detect_arch(){ local architecture if [ -n "$(uname -m | grep arm64)" ] || [ -n "$(uname -m | grep aarch64)" ]; then - architecture="arm64" - elif [ -n "$(uname -m | grep 86)" ]; then - architecture="i386" + architecture="arm64" elif [ -n "$(uname -m | grep 64)" ]; then architecture="x86-64" elif [ -n "$(uname -m | grep armv7)" ]; then diff --git a/scripts/backup b/scripts/backup index 425d53f..5c650a0 100644 --- a/scripts/backup +++ b/scripts/backup @@ -14,9 +14,6 @@ source /usr/share/yunohost/helpers # MANAGE SCRIPT FAILURE #================================================= -ynh_clean_setup () { - true -} # Exit if an error occurs during the execution of the script ynh_abort_if_errors diff --git a/scripts/install b/scripts/install index 68f0473..fc7f598 100644 --- a/scripts/install +++ b/scripts/install @@ -13,9 +13,6 @@ source /usr/share/yunohost/helpers # MANAGE SCRIPT FAILURE #================================================= -ynh_clean_setup () { - ynh_clean_check_starting -} # Exit if an error occurs during the execution of the script ynh_abort_if_errors diff --git a/scripts/restore b/scripts/restore index cc75277..9518ed0 100644 --- a/scripts/restore +++ b/scripts/restore @@ -14,9 +14,6 @@ source /usr/share/yunohost/helpers # MANAGE SCRIPT FAILURE #================================================= -ynh_clean_setup () { - ynh_clean_check_starting -} # Exit if an error occurs during the execution of the script ynh_abort_if_errors diff --git a/scripts/upgrade b/scripts/upgrade index d102875..eeea0c8 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -25,7 +25,6 @@ architecture=$(ynh_detect_arch) #================================================= # CHECK VERSION #================================================= -ynh_script_progression --message="Checking version..." upgrade_type=$(ynh_check_app_version_changed)