From 96b76172c0f8161e21ad0cc16c765b8b2949167a Mon Sep 17 00:00:00 2001 From: Thomas <51749973+Thovi98@users.noreply.github.com> Date: Sun, 11 Feb 2024 09:38:03 +0100 Subject: [PATCH 1/9] add tone --- conf/.env | 1 + manifest.toml | 5 +++++ scripts/install | 3 ++- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/conf/.env b/conf/.env index 39b2eb6..70c672b 100644 --- a/conf/.env +++ b/conf/.env @@ -9,3 +9,4 @@ AUDIOBOOKSHELF_GID=__APP__ FFMPEG_PATH=/usr/bin/ffmpeg FFPROBE_PATH=/usr/bin/ffprobe SOURCE=local +TONE_PATH=__INSTALL_DIR__/tone diff --git a/manifest.toml b/manifest.toml index e726e1d..731ccd3 100644 --- a/manifest.toml +++ b/manifest.toml @@ -40,6 +40,11 @@ ram.runtime = "50M" sha256 = "3e813c5c0bd3e7e1e616a9097247b0696f3d3d289ec55729bd6c6115442abd87" autoupdate.strategy = "latest_github_tag" + [resources.sources.tone] + url = "https://github.com/sandreas/tone/releases/download/v0.1.5/tone-0.1.5-linux-x64.tar.gz" + sha256 = "29c197b21c6e36a3b889ebd6bb1fbdd2c95e489ac6508d010adcf6f69ab8ceba" + autoupdate.strategy = "latest_github_release" + [resources.system_user] [resources.install_dir] diff --git a/scripts/install b/scripts/install index cd64e0a..bb24d31 100755 --- a/scripts/install +++ b/scripts/install @@ -25,7 +25,8 @@ ynh_npm install --global npm@7.21.1 ynh_script_progression --message="Setting up source files..." --weight=1 # Download, check integrity, uncompress and patch the source from app.src -ynh_setup_source --dest_dir="$install_dir" +ynh_setup_source --dest_dir="$install_dir" --source_id="main" +ynh_setup_source --dest_dir="$install_dir" --source_id="tone" chmod 750 "$install_dir" chmod -R o-rwx "$install_dir" From c05f54d2ab4487c72bcdf007de7572e6896b55f3 Mon Sep 17 00:00:00 2001 From: Thomas <51749973+Thovi98@users.noreply.github.com> Date: Sun, 11 Feb 2024 10:24:58 +0100 Subject: [PATCH 2/9] upgrade nodejs and npm versions --- scripts/_common.sh | 2 +- scripts/install | 2 +- scripts/restore | 2 +- scripts/upgrade | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 18046c5..68c5a06 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -7,7 +7,7 @@ # dependencies used by the app # nodejs version -nodejs_version=16 +nodejs_version=20 #================================================= # PERSONAL HELPERS diff --git a/scripts/install b/scripts/install index bb24d31..d18f078 100755 --- a/scripts/install +++ b/scripts/install @@ -17,7 +17,7 @@ ynh_script_progression --message="Installing dependencies..." --weight=10 ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version # Upgrade NPM -ynh_npm install --global npm@7.21.1 +ynh_npm install --global npm@latest #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE diff --git a/scripts/restore b/scripts/restore index fc373e5..40778d5 100755 --- a/scripts/restore +++ b/scripts/restore @@ -18,7 +18,7 @@ ynh_script_progression --message="Reinstalling dependencies..." --weight=10 ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version # Upgrade NPM -ynh_npm install --global npm@7.21.1 +ynh_npm install --global npm@latest #================================================= # STANDARD RESTORATION STEPS diff --git a/scripts/upgrade b/scripts/upgrade index 66248a8..88768ad 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -17,7 +17,7 @@ ynh_script_progression --message="Upgrading dependencies..." --weight=10 ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version # Upgrade NPM -ynh_npm install --global npm@7.21.1 +ynh_npm install --global npm@latest #================================================= # CHECK VERSION From 12fc02db7e20208a7683438437c5c373fc767ba5 Mon Sep 17 00:00:00 2001 From: Thomas <51749973+Thovi98@users.noreply.github.com> Date: Sun, 11 Feb 2024 10:35:48 +0100 Subject: [PATCH 3/9] try with nodejs 18 --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 68c5a06..14f779d 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -7,7 +7,7 @@ # dependencies used by the app # nodejs version -nodejs_version=20 +nodejs_version=18 #================================================= # PERSONAL HELPERS From cb27c51a57369673a222e0ea6773b8061f38f477 Mon Sep 17 00:00:00 2001 From: Thomas <51749973+Thovi98@users.noreply.github.com> Date: Sun, 11 Feb 2024 12:47:12 +0100 Subject: [PATCH 4/9] =?UTF-8?q?don=E2=80=99t=20update=20nodejs=20and=20npm?= =?UTF-8?q?=20for=20now?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/_common.sh | 2 +- scripts/install | 2 +- scripts/restore | 2 +- scripts/upgrade | 3 +-- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 14f779d..18046c5 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -7,7 +7,7 @@ # dependencies used by the app # nodejs version -nodejs_version=18 +nodejs_version=16 #================================================= # PERSONAL HELPERS diff --git a/scripts/install b/scripts/install index d18f078..bb24d31 100755 --- a/scripts/install +++ b/scripts/install @@ -17,7 +17,7 @@ ynh_script_progression --message="Installing dependencies..." --weight=10 ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version # Upgrade NPM -ynh_npm install --global npm@latest +ynh_npm install --global npm@7.21.1 #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE diff --git a/scripts/restore b/scripts/restore index 40778d5..fc373e5 100755 --- a/scripts/restore +++ b/scripts/restore @@ -18,7 +18,7 @@ ynh_script_progression --message="Reinstalling dependencies..." --weight=10 ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version # Upgrade NPM -ynh_npm install --global npm@latest +ynh_npm install --global npm@7.21.1 #================================================= # STANDARD RESTORATION STEPS diff --git a/scripts/upgrade b/scripts/upgrade index 88768ad..d53d656 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -17,8 +17,7 @@ ynh_script_progression --message="Upgrading dependencies..." --weight=10 ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version # Upgrade NPM -ynh_npm install --global npm@latest - +ynh_npm install --global npm@7.21.1 #================================================= # CHECK VERSION #================================================= From d3e942a5714b689fc3fe35e27507cb5fe15c8973 Mon Sep 17 00:00:00 2001 From: Thomas <51749973+Thovi98@users.noreply.github.com> Date: Sun, 11 Feb 2024 17:26:07 +0100 Subject: [PATCH 5/9] forgot to update upgrade script --- scripts/upgrade | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/upgrade b/scripts/upgrade index d53d656..f16b070 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -63,6 +63,7 @@ then # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$install_dir" --keep=".env" + ynh_setup_source --dest_dir="$install_dir" --source_id="tone" fi chmod 750 "$install_dir" From acc7122198c9bb6507a65d3243d395f3624e0e02 Mon Sep 17 00:00:00 2001 From: Thomas <51749973+Thovi98@users.noreply.github.com> Date: Mon, 12 Feb 2024 19:40:02 +0100 Subject: [PATCH 6/9] remove autoupdate for tone --- manifest.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 731ccd3..5f5f89c 100644 --- a/manifest.toml +++ b/manifest.toml @@ -43,7 +43,6 @@ ram.runtime = "50M" [resources.sources.tone] url = "https://github.com/sandreas/tone/releases/download/v0.1.5/tone-0.1.5-linux-x64.tar.gz" sha256 = "29c197b21c6e36a3b889ebd6bb1fbdd2c95e489ac6508d010adcf6f69ab8ceba" - autoupdate.strategy = "latest_github_release" [resources.system_user] From 8f305de4312ce68ad2b5565a26fa604f818e222e Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 21 Feb 2024 22:11:58 +0100 Subject: [PATCH 7/9] Upgrade to v2.8.0 --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 5f5f89c..422e8f5 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Audiobookshelf" description.en = "Audiobook server for managing and playing your audiobooks" description.fr = "Serveur de livres audio pour gérer et lire vos livres audio" -version = "2.7.2~ynh1" +version = "2.8.0~ynh1" maintainers = ["Navan Chauhan"] @@ -36,8 +36,8 @@ ram.runtime = "50M" [resources] [resources.sources] [resources.sources.main] - url = "https://github.com/advplyr/audiobookshelf/archive/refs/tags/v2.7.2.tar.gz" - sha256 = "3e813c5c0bd3e7e1e616a9097247b0696f3d3d289ec55729bd6c6115442abd87" + url = "https://github.com/advplyr/audiobookshelf/archive/refs/tags/v2.8.0.tar.gz" + sha256 = "bbe6b96a791aa11ab91369bdfc82b1984650a5e026c676df6faaaf0ab84510ed" autoupdate.strategy = "latest_github_tag" [resources.sources.tone] From afcc80d03ea965d3ec97ac9f3a820092341a2218 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 21 Feb 2024 21:12:02 +0000 Subject: [PATCH 8/9] Auto-update README --- README.md | 6 +++--- README_fr.md | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 8b6b615..91511c9 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ @@ -31,7 +31,7 @@ Audiobookshelf is a self-hosted audiobook server for managing and playing your a * Chromecast support on the web app * Fetch metadata and cover art from several sources -**Shipped version:** 2.7.2~ynh1 +**Shipped version:** 2.8.0~ynh1 ## Screenshots @@ -57,4 +57,4 @@ or sudo yunohost app upgrade audiobookshelf -u https://github.com/YunoHost-Apps/audiobookshelf_ynh/tree/testing --debug ``` -**More info regarding app packaging:** +**More info regarding app packaging:** \ No newline at end of file diff --git a/README_fr.md b/README_fr.md index 53d506b..29089a6 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,5 +1,5 @@ @@ -31,7 +31,7 @@ Audiobookshelf est un serveur auto-hébergé pour gérer et lire vos livres audi * Support de Chromecast dans la webapp * Récupération des métadonnées et des pochettes depuis plusieurs sources -**Version incluse :** 2.7.2~ynh1 +**Version incluse :** 2.8.0~ynh1 ## Captures d’écran From 3cdb3ed4bcce34fa7ec9398193d803cecc4185a3 Mon Sep 17 00:00:00 2001 From: Thomas <51749973+Thovi98@users.noreply.github.com> Date: Fri, 23 Feb 2024 08:24:14 +0100 Subject: [PATCH 9/9] readd tone autoupdate --- manifest.toml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/manifest.toml b/manifest.toml index 422e8f5..1237da9 100644 --- a/manifest.toml +++ b/manifest.toml @@ -43,6 +43,8 @@ ram.runtime = "50M" [resources.sources.tone] url = "https://github.com/sandreas/tone/releases/download/v0.1.5/tone-0.1.5-linux-x64.tar.gz" sha256 = "29c197b21c6e36a3b889ebd6bb1fbdd2c95e489ac6508d010adcf6f69ab8ceba" + autoupdate.strategy = "latest_github_release" + autoupdate.upstream = "https://github.com/sandreas/tone" [resources.system_user]