From 970bbf2d0e23f9d9fbef103f0b1f8c2bc5fcf0e8 Mon Sep 17 00:00:00 2001 From: Salamandar <6552989+Salamandar@users.noreply.github.com> Date: Sat, 19 Feb 2022 19:22:09 +0100 Subject: [PATCH 01/19] Bump ynh pkg version to trigger updates ! --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 968525a..cb09821 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Media System that manage and stream your media.", "fr": "Système multimédia qui gère et diffuse vos médias." }, - "version": "10.7.7~ynh2", + "version": "10.7.7~ynh3", "url": "https://jellyfin.org", "upstream": { "license": "GPL-2.0-only", From eecac84f4b0c10fcaf2c9dd6fb53225a6b24b3d0 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot Date: Sat, 19 Feb 2022 18:22:13 +0000 Subject: [PATCH 02/19] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index eaa13a7..8d5a6bd 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Media System that manage and stream your media. -**Shipped version:** 10.7.7~ynh2 +**Shipped version:** 10.7.7~ynh3 **Demo:** https://demo.jellyfin.org/stable/web/index.html diff --git a/README_fr.md b/README_fr.md index 70a42b9..67209f9 100644 --- a/README_fr.md +++ b/README_fr.md @@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Système multimédia qui gère et diffuse vos médias. -**Version incluse :** 10.7.7~ynh2 +**Version incluse :** 10.7.7~ynh3 **Démo :** https://demo.jellyfin.org/stable/web/index.html From d8347ddccd65d565aef77060c360e6e2df1ecb43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Sat, 19 Feb 2022 19:57:40 +0100 Subject: [PATCH 03/19] Remove custom http->https redirect, required yunohost>=4.3 --- conf/nginx.conf | 7 ------- manifest.json | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 6e69e55..a259f72 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,12 +1,5 @@ #sub_path_only rewrite ^__PATH__$ __PATH__/ permanent; location __PATH__/ { - - # Force usage of https - if ($scheme = http) { - rewrite ^ https://$server_name$request_uri? permanent; - } - - # Proxy main Jellyfin traffic proxy_pass http://127.0.0.1:__PORT____PATH__/; proxy_pass_request_headers on; proxy_set_header Host $host; diff --git a/manifest.json b/manifest.json index cb09821..8850b0a 100644 --- a/manifest.json +++ b/manifest.json @@ -27,7 +27,7 @@ } ], "requirements": { - "yunohost": ">= 4.2" + "yunohost": ">=4.3" }, "multi_instance": false, "services": [ From 56417ce7ce02c7f80c1c6fe10413a960f7b18561 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Sun, 20 Feb 2022 10:29:11 +0100 Subject: [PATCH 04/19] Fix : restore was forgetting about logrotate --- scripts/restore | 7 +++++++ scripts/upgrade | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/scripts/restore b/scripts/restore index 4317ab3..1f0a726 100644 --- a/scripts/restore +++ b/scripts/restore @@ -168,6 +168,13 @@ else yunohost service add $app --description="Jellyfin media center" --needs_exposed_ports ${needed_ports[@]} fi +#================================================= +# RESTORE THE LOGROTATE CONFIGURATION +#================================================= +ynh_script_progression --message="Restoring the logrotate configuration..." --time --weight=1 + +ynh_restore_file --origin_path="/etc/logrotate.d/$app" + #================================================= # RESTORE USER RIGHTS #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 264dcbf..0c67654 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -72,6 +72,11 @@ if [ -z "$discovery" ]; then ynh_app_setting_set --app=$app --key=discovery --value=$discovery fi +if [ ! -f "/etc/logrotate.d/$app" ]; then + # Fix possibly missing file due to buggy restore: + ynh_use_logrotate +fi + #================================================= # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP #================================================= From f596efe4a955b7a4ffc45d8adcb5118004a612c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Sun, 20 Feb 2022 10:29:44 +0100 Subject: [PATCH 05/19] Refactor: bad indentation --- scripts/install | 30 +++++++++++++++--------------- scripts/restore | 30 +++++++++++++++--------------- scripts/upgrade | 30 +++++++++++++++--------------- 3 files changed, 45 insertions(+), 45 deletions(-) diff --git a/scripts/install b/scripts/install index 161de0a..edc8c69 100644 --- a/scripts/install +++ b/scripts/install @@ -76,23 +76,23 @@ discovery_service=$discovery discovery_client=$discovery if [ $discovery -eq 1 ]; then - ynh_script_progression --message="Configuring firewall..." --weight=1 + ynh_script_progression --message="Configuring firewall..." --weight=1 - # Open port 1900 for service auto-discovery - if ynh_port_available --port=$discovery_service_port; then - ynh_exec_warn_less yunohost firewall allow UDP $discovery_service_port - else - discovery_service=0 - ynh_print_warn --message="Port $discovery_service_port (for service auto-discovery) is not available. Continuing nonetheless." - fi + # Open port 1900 for service auto-discovery + if ynh_port_available --port=$discovery_service_port; then + ynh_exec_warn_less yunohost firewall allow UDP $discovery_service_port + else + discovery_service=0 + ynh_print_warn --message="Port $discovery_service_port (for service auto-discovery) is not available. Continuing nonetheless." + fi - # Open port 7359 for client auto-discovery - if ynh_port_available --port=$discovery_client_port; then - ynh_exec_warn_less yunohost firewall allow UDP $discovery_client_port - else - discovery_client=0 - ynh_print_warn --message="Port $discovery_client_port (for client auto-discovery) is not available. Continuing nonetheless." - fi + # Open port 7359 for client auto-discovery + if ynh_port_available --port=$discovery_client_port; then + ynh_exec_warn_less yunohost firewall allow UDP $discovery_client_port + else + discovery_client=0 + ynh_print_warn --message="Port $discovery_client_port (for client auto-discovery) is not available. Continuing nonetheless." + fi fi ynh_app_setting_set --app=$app --key=discovery_service --value=$discovery_service diff --git a/scripts/restore b/scripts/restore index 1f0a726..22da6d5 100644 --- a/scripts/restore +++ b/scripts/restore @@ -58,23 +58,23 @@ discovery_service=$discovery discovery_client=$discovery if [ $discovery -eq 1 ]; then - ynh_script_progression --message="Configuring firewall..." --weight=1 + ynh_script_progression --message="Configuring firewall..." --weight=1 - # Open port 1900 for service auto-discovery - if ynh_port_available --port=$discovery_service_port; then - ynh_exec_warn_less yunohost firewall allow UDP $discovery_service_port - else - discovery_service=0 - ynh_print_warn --message="Port $discovery_service_port (for service auto-discovery) is not available. Continuing nonetheless." - fi + # Open port 1900 for service auto-discovery + if ynh_port_available --port=$discovery_service_port; then + ynh_exec_warn_less yunohost firewall allow UDP $discovery_service_port + else + discovery_service=0 + ynh_print_warn --message="Port $discovery_service_port (for service auto-discovery) is not available. Continuing nonetheless." + fi - # Open port 7359 for client auto-discovery - if ynh_port_available --port=$discovery_client_port; then - ynh_exec_warn_less yunohost firewall allow UDP $discovery_client_port - else - discovery_client=0 - ynh_print_warn --message="Port $discovery_client_port (for client auto-discovery) is not available. Continuing nonetheless." - fi + # Open port 7359 for client auto-discovery + if ynh_port_available --port=$discovery_client_port; then + ynh_exec_warn_less yunohost firewall allow UDP $discovery_client_port + else + discovery_client=0 + ynh_print_warn --message="Port $discovery_client_port (for client auto-discovery) is not available. Continuing nonetheless." + fi fi ynh_app_setting_set --app=$app --key=discovery_service --value=$discovery_service diff --git a/scripts/upgrade b/scripts/upgrade index 0c67654..778f82e 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -101,23 +101,23 @@ discovery_service=$discovery discovery_client=$discovery if [ $discovery -eq 1 ]; then - ynh_script_progression --message="Configuring firewall..." --weight=1 + ynh_script_progression --message="Configuring firewall..." --weight=1 - # Open port 1900 for service auto-discovery - if ynh_port_available --port=$discovery_service_port; then - ynh_exec_warn_less yunohost firewall allow UDP $discovery_service_port - else - discovery_service=0 - ynh_print_warn --message="Port $discovery_service_port (for service auto-discovery) is not available. Continuing nonetheless." - fi + # Open port 1900 for service auto-discovery + if ynh_port_available --port=$discovery_service_port; then + ynh_exec_warn_less yunohost firewall allow UDP $discovery_service_port + else + discovery_service=0 + ynh_print_warn --message="Port $discovery_service_port (for service auto-discovery) is not available. Continuing nonetheless." + fi - # Open port 7359 for client auto-discovery - if ynh_port_available --port=$discovery_client_port; then - ynh_exec_warn_less yunohost firewall allow UDP $discovery_client_port - else - discovery_client=0 - ynh_print_warn --message="Port $discovery_client_port (for client auto-discovery) is not available. Continuing nonetheless." - fi + # Open port 7359 for client auto-discovery + if ynh_port_available --port=$discovery_client_port; then + ynh_exec_warn_less yunohost firewall allow UDP $discovery_client_port + else + discovery_client=0 + ynh_print_warn --message="Port $discovery_client_port (for client auto-discovery) is not available. Continuing nonetheless." + fi fi ynh_app_setting_set --app=$app --key=discovery_service --value=$discovery_service From 4d013faeb4ff24d96bc3782380a00dfeb022caba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Sun, 20 Feb 2022 10:30:14 +0100 Subject: [PATCH 06/19] Refactor: Bashisms --- scripts/install | 8 ++------ scripts/restore | 6 +----- scripts/upgrade | 6 +----- 3 files changed, 4 insertions(+), 16 deletions(-) diff --git a/scripts/install b/scripts/install index edc8c69..1590d68 100644 --- a/scripts/install +++ b/scripts/install @@ -150,7 +150,7 @@ ynh_script_progression --message="Configuring system user..." --weight=2 # Create a system user ynh_system_user_create --username=$app -if [ $(grep -q "^render:" /etc/group) ]; then +if grep -q "^render:" /etc/group; then # Add user to render group adduser $app render fi @@ -218,11 +218,7 @@ needed_ports=() (( $discovery_client == 1 )) && needed_ports+=( "$discovery_client_port" ) # Integrate service and require to expose the ports if needed -if [[ -z ${needed_ports[@]} ]]; then - yunohost service add $app --description="Jellyfin media center" -else - yunohost service add $app --description="Jellyfin media center" --needs_exposed_ports ${needed_ports[@]} -fi +yunohost service add $app --description="Jellyfin media center" ${needed_ports:+--needs_exposed_ports} "${needed_ports[@]}" #================================================= # START SYSTEMD SERVICE diff --git a/scripts/restore b/scripts/restore index 22da6d5..620b9ed 100644 --- a/scripts/restore +++ b/scripts/restore @@ -162,11 +162,7 @@ needed_ports=() (( $discovery_client == 1 )) && needed_ports+=( "$discovery_client_port" ) # Integrate service and require to expose the ports if needed -if [[ -z ${needed_ports[@]} ]]; then - yunohost service add $app --description="Jellyfin media center" -else - yunohost service add $app --description="Jellyfin media center" --needs_exposed_ports ${needed_ports[@]} -fi +yunohost service add $app --description="Jellyfin media center" ${needed_ports:+--needs_exposed_ports} "${needed_ports[@]}" #================================================= # RESTORE THE LOGROTATE CONFIGURATION diff --git a/scripts/upgrade b/scripts/upgrade index 778f82e..efff534 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -241,11 +241,7 @@ needed_ports=() (( $discovery_client == 1 )) && needed_ports+=( "$discovery_client_port" ) # Integrate service and require to expose the ports if needed -if [[ -z ${needed_ports[@]} ]]; then - yunohost service add $app --description="Jellyfin media center" -else - yunohost service add $app --description="Jellyfin media center" --needs_exposed_ports ${needed_ports[@]} -fi +yunohost service add $app --description="Jellyfin media center" ${needed_ports:+--needs_exposed_ports} "${needed_ports[@]}" #================================================= # START SYSTEMD SERVICE From fca163a3be5ea1a281bbf0e5ec1b2e125c8d3fce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Sun, 20 Feb 2022 10:35:02 +0100 Subject: [PATCH 07/19] Refactor : deduplicate code for installing .deb packages --- scripts/_common.sh | 35 +++++++++++++++++++++++++++++++++++ scripts/install | 24 +----------------------- scripts/restore | 24 +----------------------- scripts/upgrade | 24 +----------------------- 4 files changed, 38 insertions(+), 69 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 04ae441..48d562c 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -60,6 +60,41 @@ pkg_dependencies="${ffmpeg_deps[*]} ${jellyfin_deps[*]}" # PERSONAL HELPERS #================================================= +install_jellyfin_packages() { + # In case of a new version, the url change from + # https://repo.jellyfin.org/releases/server/debian/versions/stable/server/X.X.X/jellyfin-server_X.X.X-1_$architecture.deb to + # https://repo.jellyfin.org/archive/debian/stable/X.X.X/server/jellyfin-server_X.X.X-1_$architecture.deb + src_url=$(grep 'SOURCE_URL=' "../conf/server.$debian.$architecture.src" | cut -d= -f2-) + if ! curl --output /dev/null --silent --head --fail "$src_url"; then + ynh_replace_string \ + --match_string="releases/server/debian/versions/stable/server/$version/" \ + --replace_string="archive/debian/stable/$version/server/" \ + --target_file="../conf/server.$debian.$architecture.src" + fi + + # Same for web + src_url=$(grep 'SOURCE_URL=' "../conf/web.$debian.$architecture.src" | cut -d= -f2-) + if ! curl --output /dev/null --silent --head --fail "$src_url"; then + ynh_replace_string \ + --match_string="releases/server/debian/versions/stable/web/$version/" \ + --replace_string="archive/debian/stable/$version/web/" \ + --target_file="../conf/web.$debian.$architecture.src" + fi + + # Create the temporary directory + tempdir="$(mktemp -d)" + + # Download the deb files + ynh_setup_source --dest_dir=$tempdir --source_id="ffmpeg.$debian.$architecture" + ynh_setup_source --dest_dir=$tempdir --source_id="server.$debian.$architecture" + ynh_setup_source --dest_dir=$tempdir --source_id="web.$debian.$architecture" + + # Install the packages + ynh_exec_warn_less dpkg --force-confdef --force-confnew -i $tempdir/jellyfin-ffmpeg.deb + ynh_exec_warn_less dpkg --force-confdef --force-confnew -i $tempdir/jellyfin-server.deb + ynh_exec_warn_less dpkg --force-confdef --force-confnew -i $tempdir/jellyfin-web.deb +} + #================================================= # EXPERIMENTAL HELPERS #================================================= diff --git a/scripts/install b/scripts/install index 1590d68..f18c9ed 100644 --- a/scripts/install +++ b/scripts/install @@ -110,29 +110,7 @@ ynh_install_app_dependencies $pkg_dependencies #================================================= ynh_script_progression --message="Installing packages..." --weight=1 -# Create the temporary directory -tempdir="$(mktemp -d)" - -# Download the deb files -ynh_setup_source --dest_dir=$tempdir --source_id="ffmpeg.$debian.$architecture" -# In case of a new version, the url change from https://repo.jellyfin.org/releases/server/debian/versions/stable/server/X.X.X/jellyfin-server_X.X.X-1_$architecture.deb to https://repo.jellyfin.org/archive/debian/stable/X.X.X/server/jellyfin-server_X.X.X-1_$architecture.deb -src_url=$(grep 'SOURCE_URL=' "../conf/server.$debian.$architecture.src" | cut -d= -f2-) -if ! curl --output /dev/null --silent --head --fail "$src_url"; then - ynh_replace_string --match_string="releases/server/debian/versions/stable/server/$version/jellyfin-server_$version-1_$architecture.deb" --replace_string="archive/debian/stable/$version/server/jellyfin-server_$version-1_$architecture.deb" --target_file="../conf/server.$debian.$architecture.src" -fi -ynh_setup_source --dest_dir=$tempdir --source_id="server.$debian.$architecture" - -# Same for web -src_url=$(grep 'SOURCE_URL=' "../conf/web.$debian.$architecture.src" | cut -d= -f2-) -if ! curl --output /dev/null --silent --head --fail "$src_url"; then - ynh_replace_string --match_string="releases/server/debian/versions/stable/web/$version/jellyfin-web_$version-1_all.deb" --replace_string="archive/debian/stable/$version/web/jellyfin-web_$version-1_all.deb" --target_file="../conf/web.$debian.$architecture.src" -fi -ynh_setup_source --dest_dir=$tempdir --source_id="web.$debian.$architecture" - -# Install the packages -ynh_exec_warn_less dpkg -i $tempdir/jellyfin-ffmpeg.deb -ynh_exec_warn_less dpkg -i $tempdir/jellyfin-server.deb -ynh_exec_warn_less dpkg -i $tempdir/jellyfin-web.deb +install_jellyfin_packages #================================================= # NGINX CONFIGURATION diff --git a/scripts/restore b/scripts/restore index 620b9ed..fc05ad9 100644 --- a/scripts/restore +++ b/scripts/restore @@ -119,29 +119,7 @@ ynh_install_app_dependencies $pkg_dependencies #================================================= ynh_script_progression --message="Reinstalling packages..." --weight=7 -# Create the temporary directory -tempdir="$(mktemp -d)" - -# Download the deb files -ynh_setup_source --dest_dir=$tempdir --source_id="ffmpeg.$debian.$architecture" -# In case of a new version, the url change from https://repo.jellyfin.org/releases/server/debian/versions/stable/server/X.X.X/jellyfin-server_X.X.X-1_$architecture.deb to https://repo.jellyfin.org/archive/debian/stable/X.X.X/server/jellyfin-server_X.X.X-1_$architecture.deb -src_url=$(grep 'SOURCE_URL=' "../settings/conf/server.$debian.$architecture.src" | cut -d= -f2-) -if ! curl --output /dev/null --silent --head --fail "$src_url"; then - ynh_replace_string --match_string="releases/server/debian/versions/stable/server/$version/jellyfin-server_$version-1_$architecture.deb" --replace_string="archive/debian/stable/$version/server/jellyfin-server_$version-1_$architecture.deb" --target_file="../settings/conf/server.$debian.$architecture.src" -fi -ynh_setup_source --dest_dir=$tempdir --source_id="server.$debian.$architecture" - -# Same for web -src_url=$(grep 'SOURCE_URL=' "../settings/conf/web.$debian.$architecture.src" | cut -d= -f2-) -if ! curl --output /dev/null --silent --head --fail "$src_url"; then - ynh_replace_string --match_string="releases/server/debian/versions/stable/web/$version/jellyfin-web_$version-1_all.deb" --replace_string="archive/debian/stable/$version/web/jellyfin-web_$version-1_all.deb" --target_file="../settings/conf/web.$debian.$architecture.src" -fi -ynh_setup_source --dest_dir=$tempdir --source_id="web.$debian.$architecture" - -# Install the packages -ynh_exec_warn_less dpkg --force-confdef --force-confold -i $tempdir/jellyfin-ffmpeg.deb -ynh_exec_warn_less dpkg --force-confdef --force-confold -i $tempdir/jellyfin-server.deb -ynh_exec_warn_less dpkg --force-confdef --force-confold -i $tempdir/jellyfin-web.deb +install_jellyfin_packages #================================================= # RESTORE SYSTEMD diff --git a/scripts/upgrade b/scripts/upgrade index efff534..bf76cb7 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -151,29 +151,7 @@ ynh_install_app_dependencies $pkg_dependencies #================================================= ynh_script_progression --message="Upgrading packages..." --weight=3 -# Create the temporary directory -tempdir="$(mktemp -d)" - -# Download the deb files -ynh_setup_source --dest_dir=$tempdir --source_id="ffmpeg.$debian.$architecture" -# In case of a new version, the url change from https://repo.jellyfin.org/releases/server/debian/versions/stable/server/X.X.X/jellyfin-server_X.X.X-1_$architecture.deb to https://repo.jellyfin.org/archive/debian/stable/X.X.X/server/jellyfin-server_X.X.X-1_$architecture.deb -src_url=$(grep 'SOURCE_URL=' "../conf/server.$debian.$architecture.src" | cut -d= -f2-) -if ! curl --output /dev/null --silent --head --fail "$src_url"; then - ynh_replace_string --match_string="releases/server/debian/versions/stable/server/$version/jellyfin-server_$version-1_$architecture.deb" --replace_string="archive/debian/stable/$version/server/jellyfin-server_$version-1_$architecture.deb" --target_file="../conf/server.$debian.$architecture.src" -fi -ynh_setup_source --dest_dir=$tempdir --source_id="server.$debian.$architecture" - -# Same for web -src_url=$(grep 'SOURCE_URL=' "../conf/web.$debian.$architecture.src" | cut -d= -f2-) -if ! curl --output /dev/null --silent --head --fail "$src_url"; then - ynh_replace_string --match_string="releases/server/debian/versions/stable/web/$version/jellyfin-web_$version-1_all.deb" --replace_string="archive/debian/stable/$version/web/jellyfin-web_$version-1_all.deb" --target_file="../conf/web.$debian.$architecture.src" -fi -ynh_setup_source --dest_dir=$tempdir --source_id="web.$debian.$architecture" - -# Install the packages -ynh_exec_warn_less dpkg --force-confdef --force-confnew -i $tempdir/jellyfin-ffmpeg.deb -ynh_exec_warn_less dpkg --force-confdef --force-confnew -i $tempdir/jellyfin-server.deb -ynh_exec_warn_less dpkg --force-confdef --force-confnew -i $tempdir/jellyfin-web.deb +install_jellyfin_packages #================================================= # CREATE DEDICATED USER From acb61d892252e58f8c72b761f4f9996de944570b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Sun, 20 Feb 2022 10:55:08 +0100 Subject: [PATCH 08/19] Fix: Ensure dependency over the jellyfin packages on a hard version to prevent upgrades --- scripts/_common.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/scripts/_common.sh b/scripts/_common.sh index 48d562c..4aa82f5 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -93,6 +93,14 @@ install_jellyfin_packages() { ynh_exec_warn_less dpkg --force-confdef --force-confnew -i $tempdir/jellyfin-ffmpeg.deb ynh_exec_warn_less dpkg --force-confdef --force-confnew -i $tempdir/jellyfin-server.deb ynh_exec_warn_less dpkg --force-confdef --force-confnew -i $tempdir/jellyfin-web.deb + + # The doc says it should be called only once, + # but the code says multiple calls are supported. + # Also, they're already installed so that should be quasi instantaneous. + ynh_install_app_dependencies \ + jellyfin-ffmpeg="$ffmpeg_pkg_version" \ + jellyfin-server="$pkg_version" \ + jellyfin-web="$pkg_version" } #================================================= From 1916adc2367dd0621bcd44cb5e67db19733b29b8 Mon Sep 17 00:00:00 2001 From: Salamandar <6552989+Salamandar@users.noreply.github.com> Date: Sun, 20 Feb 2022 16:22:43 +0100 Subject: [PATCH 09/19] Remove superfluous example values for admin and domain argument --- manifest.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/manifest.json b/manifest.json index 8850b0a..5e50f88 100644 --- a/manifest.json +++ b/manifest.json @@ -38,7 +38,6 @@ { "name": "domain", "type": "domain", - "example": "example.com" }, { "name": "path", @@ -49,7 +48,6 @@ { "name": "admin", "type": "user", - "example": "johndoe" }, { "name": "is_public", From 88935b9450935c4a8021e01e1d16fdb05e79c001 Mon Sep 17 00:00:00 2001 From: Salamandar <6552989+Salamandar@users.noreply.github.com> Date: Mon, 21 Feb 2022 08:57:11 +0100 Subject: [PATCH 10/19] remove superfluous commas --- manifest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index 5e50f88..3a341aa 100644 --- a/manifest.json +++ b/manifest.json @@ -37,7 +37,7 @@ "install" : [ { "name": "domain", - "type": "domain", + "type": "domain" }, { "name": "path", @@ -47,7 +47,7 @@ }, { "name": "admin", - "type": "user", + "type": "user" }, { "name": "is_public", From 0f911a5c83ac08c9ad69dfe2549015d7ea161fc0 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Fri, 3 Jun 2022 00:02:43 +0200 Subject: [PATCH 11/19] Fix jellyfin-ffmpeg version name --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 4aa82f5..0dbaa82 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -98,7 +98,7 @@ install_jellyfin_packages() { # but the code says multiple calls are supported. # Also, they're already installed so that should be quasi instantaneous. ynh_install_app_dependencies \ - jellyfin-ffmpeg="$ffmpeg_pkg_version" \ + jellyfin-ffmpeg="$ffmpeg_pkg_version-$debian" \ jellyfin-server="$pkg_version" \ jellyfin-web="$pkg_version" } From 4402bd55bbdaa6ca2d8558dd93b773770dac1a1a Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 2 Jun 2022 22:03:00 +0000 Subject: [PATCH 12/19] Auto-update README --- README.md | 19 ++++++++++--------- README_fr.md | 25 +++++++++++++++---------- 2 files changed, 25 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index 8d5a6bd..142a261 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ It shall NOT be edited by hand. # Jellyfin for YunoHost -[![Integration level](https://dash.yunohost.org/integration/jellyfin.svg)](https://dash.yunohost.org/appci/app/jellyfin) ![](https://ci-apps.yunohost.org/ci/badges/jellyfin.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/jellyfin.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/jellyfin.svg)](https://dash.yunohost.org/appci/app/jellyfin) ![Working status](https://ci-apps.yunohost.org/ci/badges/jellyfin.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/jellyfin.maintain.svg) [![Install Jellyfin with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=jellyfin) *[Lire ce readme en français.](./README_fr.md)* @@ -23,7 +23,7 @@ Media System that manage and stream your media. ## Screenshots -![](./doc/screenshots/jellyfin.png) +![Screenshot of Jellyfin](./doc/screenshots/jellyfin.png) ## Disclaimers / important information @@ -41,21 +41,22 @@ if you want the upgrade to open them for you. ## Documentation and resources -* Official app website: https://jellyfin.org -* Official user documentation: https://jellyfin.org/docs/ -* Upstream app code repository: https://github.com/jellyfin/jellyfin -* YunoHost documentation for this app: https://yunohost.org/app_jellyfin -* Report a bug: https://github.com/YunoHost-Apps/jellyfin_ynh/issues +* Official app website: +* Official user documentation: +* Upstream app code repository: +* YunoHost documentation for this app: +* Report a bug: ## Developer info Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/jellyfin_ynh/tree/testing). To try the testing branch, please proceed like that. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/jellyfin_ynh/tree/testing --debug or sudo yunohost app upgrade jellyfin -u https://github.com/YunoHost-Apps/jellyfin_ynh/tree/testing --debug ``` -**More info regarding app packaging:** https://yunohost.org/packaging_apps \ No newline at end of file +**More info regarding app packaging:** diff --git a/README_fr.md b/README_fr.md index 67209f9..b1cd487 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,10 +1,14 @@ + + # Jellyfin pour YunoHost -[![Niveau d'intégration](https://dash.yunohost.org/integration/jellyfin.svg)](https://dash.yunohost.org/appci/app/jellyfin) ![](https://ci-apps.yunohost.org/ci/badges/jellyfin.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/jellyfin.maintain.svg) +[![Niveau d'intégration](https://dash.yunohost.org/integration/jellyfin.svg)](https://dash.yunohost.org/appci/app/jellyfin) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/jellyfin.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/jellyfin.maintain.svg) [![Installer Jellyfin avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=jellyfin) *[Read this readme in english.](./README.md)* -*[Lire ce readme en français.](./README_fr.md)* > *Ce package vous permet d'installer Jellyfin rapidement et simplement sur un serveur YunoHost. Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.* @@ -19,7 +23,7 @@ Système multimédia qui gère et diffuse vos médias. ## Captures d'écran -![](./doc/screenshots/jellyfin.png) +![Capture d'écran de Jellyfin](./doc/screenshots/jellyfin.png) ## Avertissements / informations importantes @@ -37,21 +41,22 @@ si vous voulez que la mise à jour les ouvre pour vous. ## Documentations et ressources -* Site officiel de l'app : https://jellyfin.org -* Documentation officielle utilisateur : https://jellyfin.org/docs/ -* Dépôt de code officiel de l'app : https://github.com/jellyfin/jellyfin -* Documentation YunoHost pour cette app : https://yunohost.org/app_jellyfin -* Signaler un bug : https://github.com/YunoHost-Apps/jellyfin_ynh/issues +* Site officiel de l'app : +* Documentation officielle utilisateur : +* Dépôt de code officiel de l'app : +* Documentation YunoHost pour cette app : +* Signaler un bug : ## Informations pour les développeurs Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/jellyfin_ynh/tree/testing). Pour essayer la branche testing, procédez comme suit. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/jellyfin_ynh/tree/testing --debug ou sudo yunohost app upgrade jellyfin -u https://github.com/YunoHost-Apps/jellyfin_ynh/tree/testing --debug ``` -**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps \ No newline at end of file +**Plus d'infos sur le packaging d'applications :** From 023fe00f42d8a1ba9437a58b7345accdb9eb152a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Sat, 19 Feb 2022 23:53:05 +0100 Subject: [PATCH 13/19] Upgrade to v10.8.0-beta2 --- conf/ffmpeg.bullseye.amd64.src | 6 +++--- conf/ffmpeg.bullseye.arm64.src | 6 +++--- conf/ffmpeg.bullseye.armhf.src | 6 +++--- conf/ffmpeg.buster.amd64.src | 6 +++--- conf/ffmpeg.buster.arm64.src | 6 +++--- conf/ffmpeg.buster.armhf.src | 6 +++--- conf/ffmpeg.src.default | 6 +++--- conf/ldap.src | 4 ++-- conf/server.bullseye.amd64.src | 4 ++-- conf/server.bullseye.arm64.src | 4 ++-- conf/server.bullseye.armhf.src | 4 ++-- conf/server.buster.amd64.src | 4 ++-- conf/server.buster.arm64.src | 4 ++-- conf/server.buster.armhf.src | 4 ++-- conf/server.src.default | 4 ++-- conf/web.bullseye.amd64.src | 4 ++-- conf/web.bullseye.arm64.src | 4 ++-- conf/web.bullseye.armhf.src | 4 ++-- conf/web.buster.amd64.src | 4 ++-- conf/web.buster.arm64.src | 4 ++-- conf/web.buster.armhf.src | 4 ++-- conf/web.src.default | 4 ++-- manifest.json | 2 +- scripts/_common.sh | 11 ++++++----- scripts/remove | 2 +- 25 files changed, 59 insertions(+), 58 deletions(-) diff --git a/conf/ffmpeg.bullseye.amd64.src b/conf/ffmpeg.bullseye.amd64.src index 985087a..97ec043 100644 --- a/conf/ffmpeg.bullseye.amd64.src +++ b/conf/ffmpeg.bullseye.amd64.src @@ -1,7 +1,7 @@ -SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/jellyfin-ffmpeg/4.3.2-1/jellyfin-ffmpeg_4.3.2-1-bullseye_amd64.deb -SOURCE_SUM=00bfda23ba65427566a50ce17876973c20350b69cd9ebd069cd7c6f7706414e8 +SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/jellyfin-ffmpeg/5.0.1-3/jellyfin-ffmpeg5_5.0.1-3-bullseye_amd64.deb +SOURCE_SUM=78e0c7594171bf0f10cc2a3c779434c6850c99e6a74a94bd1be0cf320e580b32 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=deb SOURCE_IN_SUBDIR=false SOURCE_EXTRACT=false -SOURCE_FILENAME=jellyfin-ffmpeg.deb +SOURCE_FILENAME=jellyfin-ffmpeg5.deb diff --git a/conf/ffmpeg.bullseye.arm64.src b/conf/ffmpeg.bullseye.arm64.src index 23b778c..444fe50 100644 --- a/conf/ffmpeg.bullseye.arm64.src +++ b/conf/ffmpeg.bullseye.arm64.src @@ -1,7 +1,7 @@ -SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/jellyfin-ffmpeg/4.3.2-1/jellyfin-ffmpeg_4.3.2-1-bullseye_arm64.deb -SOURCE_SUM=e8dce4cc4904cae5efaa2ab1f0dd6345ab840548f944352628827696a2d9625f +SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/jellyfin-ffmpeg/5.0.1-3/jellyfin-ffmpeg5_5.0.1-3-bullseye_arm64.deb +SOURCE_SUM=5a85f9a2a720f03dea645eaa3ecfadc46d743f9ae82e8bbad9d1aaa7d5f9cc6b SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=deb SOURCE_IN_SUBDIR=false SOURCE_EXTRACT=false -SOURCE_FILENAME=jellyfin-ffmpeg.deb +SOURCE_FILENAME=jellyfin-ffmpeg5.deb diff --git a/conf/ffmpeg.bullseye.armhf.src b/conf/ffmpeg.bullseye.armhf.src index 1f758b0..a7d9d6a 100644 --- a/conf/ffmpeg.bullseye.armhf.src +++ b/conf/ffmpeg.bullseye.armhf.src @@ -1,7 +1,7 @@ -SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/jellyfin-ffmpeg/4.3.2-1/jellyfin-ffmpeg_4.3.2-1-bullseye_armhf.deb -SOURCE_SUM=1d02c43218d785e4e2218a413950a6c16ab852e3e409ddad494a1ae5cf5a7e02 +SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/jellyfin-ffmpeg/5.0.1-3/jellyfin-ffmpeg5_5.0.1-3-bullseye_armhf.deb +SOURCE_SUM=52fe443d8cf69714133535da88c5e40e0f30fda2d73d1dee4a9c57d56e51a0e2 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=deb SOURCE_IN_SUBDIR=false SOURCE_EXTRACT=false -SOURCE_FILENAME=jellyfin-ffmpeg.deb +SOURCE_FILENAME=jellyfin-ffmpeg5.deb diff --git a/conf/ffmpeg.buster.amd64.src b/conf/ffmpeg.buster.amd64.src index ad97f50..81dc061 100644 --- a/conf/ffmpeg.buster.amd64.src +++ b/conf/ffmpeg.buster.amd64.src @@ -1,7 +1,7 @@ -SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/jellyfin-ffmpeg/4.3.2-1/jellyfin-ffmpeg_4.3.2-1-buster_amd64.deb -SOURCE_SUM=54987f4ede995e50e6662e7741df5205005b7e8d881af8145b71d319df6f0cb2 +SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/jellyfin-ffmpeg/5.0.1-3/jellyfin-ffmpeg5_5.0.1-3-buster_amd64.deb +SOURCE_SUM=168c9fac392d2ac8a1faba94ac8cf059efec6762aa8ad2d3b66396fddbbc675b SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=deb SOURCE_IN_SUBDIR=false SOURCE_EXTRACT=false -SOURCE_FILENAME=jellyfin-ffmpeg.deb +SOURCE_FILENAME=jellyfin-ffmpeg5.deb diff --git a/conf/ffmpeg.buster.arm64.src b/conf/ffmpeg.buster.arm64.src index 3c73ae5..7222694 100644 --- a/conf/ffmpeg.buster.arm64.src +++ b/conf/ffmpeg.buster.arm64.src @@ -1,7 +1,7 @@ -SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/jellyfin-ffmpeg/4.3.2-1/jellyfin-ffmpeg_4.3.2-1-buster_arm64.deb -SOURCE_SUM=02b8ee277f428b0519036b1657873ec65c124090f605daa235de10eb7c5a381d +SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/jellyfin-ffmpeg/5.0.1-3/jellyfin-ffmpeg5_5.0.1-3-buster_arm64.deb +SOURCE_SUM=5aa1feb2926bb678bb99e9f7192a20d27cbec94d86c370ca736a5b9ba648e0af SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=deb SOURCE_IN_SUBDIR=false SOURCE_EXTRACT=false -SOURCE_FILENAME=jellyfin-ffmpeg.deb +SOURCE_FILENAME=jellyfin-ffmpeg5.deb diff --git a/conf/ffmpeg.buster.armhf.src b/conf/ffmpeg.buster.armhf.src index aabbb53..d8c6000 100644 --- a/conf/ffmpeg.buster.armhf.src +++ b/conf/ffmpeg.buster.armhf.src @@ -1,7 +1,7 @@ -SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/jellyfin-ffmpeg/4.3.2-1/jellyfin-ffmpeg_4.3.2-1-buster_armhf.deb -SOURCE_SUM=04e99a82aae906af6fd526bfbde22b6a8ea2b3b2bb1460561ff2c543b0963d4f +SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/jellyfin-ffmpeg/5.0.1-3/jellyfin-ffmpeg5_5.0.1-3-buster_armhf.deb +SOURCE_SUM=3a3655b11ba9b9acfb79568ecd6a04074ccf8d843893bb5dd1f1d50565d6e455 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=deb SOURCE_IN_SUBDIR=false SOURCE_EXTRACT=false -SOURCE_FILENAME=jellyfin-ffmpeg.deb +SOURCE_FILENAME=jellyfin-ffmpeg5.deb diff --git a/conf/ffmpeg.src.default b/conf/ffmpeg.src.default index 4976a6c..7ff9d45 100644 --- a/conf/ffmpeg.src.default +++ b/conf/ffmpeg.src.default @@ -1,7 +1,7 @@ -SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/jellyfin-ffmpeg/__FFMPEG_PKG_VERSION__/jellyfin-ffmpeg___FFMPEG_PKG_VERSION__-__DEBIAN_____ARCHITECTURE__.deb -SOURCE_SUM=https://repo.jellyfin.org/releases/server/debian/versions/jellyfin-ffmpeg/__FFMPEG_PKG_VERSION__/jellyfin-ffmpeg___FFMPEG_PKG_VERSION__-__DEBIAN_____ARCHITECTURE__.deb.sha256sum +SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/jellyfin-ffmpeg/__FFMPEG_PKG_VERSION__/jellyfin-ffmpeg5___FFMPEG_PKG_VERSION__-__DEBIAN_____ARCHITECTURE__.deb +SOURCE_SUM=https://repo.jellyfin.org/releases/server/debian/versions/jellyfin-ffmpeg/__FFMPEG_PKG_VERSION__/jellyfin-ffmpeg5___FFMPEG_PKG_VERSION__-__DEBIAN_____ARCHITECTURE__.deb.sha256sum SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=deb SOURCE_IN_SUBDIR=false SOURCE_EXTRACT=false -SOURCE_FILENAME=jellyfin-ffmpeg.deb +SOURCE_FILENAME=jellyfin-ffmpeg5.deb diff --git a/conf/ldap.src b/conf/ldap.src index cb0025b..747ef84 100644 --- a/conf/ldap.src +++ b/conf/ldap.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://repo.jellyfin.org/releases/plugin/ldap-authentication/ldap-authentication_12.0.0.0.zip -SOURCE_SUM=e3ef05fdb0cce145504a34595aefe568e47964e981017d9ccb87f39e58fff861 +SOURCE_URL=https://repo.jellyfin.org/releases/plugin/ldap-authentication/ldap-authentication_14.0.0.0.zip +SOURCE_SUM=2306435e74d0a48bb41d83e000461136ab5a77fff5636fc246a90859701a29c1 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=false diff --git a/conf/server.bullseye.amd64.src b/conf/server.bullseye.amd64.src index bbf422f..56eb254 100644 --- a/conf/server.bullseye.amd64.src +++ b/conf/server.bullseye.amd64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/stable/server/10.7.7/jellyfin-server_10.7.7-1_amd64.deb -SOURCE_SUM=938c8be07e2d183b4ee23a0f01f78d140ecb7f58aadc7c0a6105b2e4382c7a4e +SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/stable-pre/server/10.8.0-beta2/jellyfin-server_10.8.0~beta2_amd64.deb +SOURCE_SUM=4f902f461e491090fd20c5285fdf1c465011c9107f08e98eaba938611e975228 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=deb SOURCE_IN_SUBDIR=false diff --git a/conf/server.bullseye.arm64.src b/conf/server.bullseye.arm64.src index 46a191e..4f4d227 100644 --- a/conf/server.bullseye.arm64.src +++ b/conf/server.bullseye.arm64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/stable/server/10.7.7/jellyfin-server_10.7.7-1_arm64.deb -SOURCE_SUM=0c42e615382fa567d8e274e77a65632f878680536eaf2bd77fb13a09dc59ada9 +SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/stable-pre/server/10.8.0-beta2/jellyfin-server_10.8.0~beta2_arm64.deb +SOURCE_SUM=14d502242665a5c01d2abe4facda2c8c18ff2e43631963e5b6ca037811d5915b SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=deb SOURCE_IN_SUBDIR=false diff --git a/conf/server.bullseye.armhf.src b/conf/server.bullseye.armhf.src index 1968dd0..e1f60cf 100644 --- a/conf/server.bullseye.armhf.src +++ b/conf/server.bullseye.armhf.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/stable/server/10.7.7/jellyfin-server_10.7.7-1_armhf.deb -SOURCE_SUM=685931c972ad044fbdc2ccbea07a5aaf75f93e99562ea799cd6e5a7ac4bdb0cf +SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/stable-pre/server/10.8.0-beta2/jellyfin-server_10.8.0~beta2_armhf.deb +SOURCE_SUM=0a5cb9388f4b75835f5b11adcabbd0691280431b2e62cbc75c5ab1a604b118cb SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=deb SOURCE_IN_SUBDIR=false diff --git a/conf/server.buster.amd64.src b/conf/server.buster.amd64.src index bbf422f..56eb254 100644 --- a/conf/server.buster.amd64.src +++ b/conf/server.buster.amd64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/stable/server/10.7.7/jellyfin-server_10.7.7-1_amd64.deb -SOURCE_SUM=938c8be07e2d183b4ee23a0f01f78d140ecb7f58aadc7c0a6105b2e4382c7a4e +SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/stable-pre/server/10.8.0-beta2/jellyfin-server_10.8.0~beta2_amd64.deb +SOURCE_SUM=4f902f461e491090fd20c5285fdf1c465011c9107f08e98eaba938611e975228 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=deb SOURCE_IN_SUBDIR=false diff --git a/conf/server.buster.arm64.src b/conf/server.buster.arm64.src index 46a191e..4f4d227 100644 --- a/conf/server.buster.arm64.src +++ b/conf/server.buster.arm64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/stable/server/10.7.7/jellyfin-server_10.7.7-1_arm64.deb -SOURCE_SUM=0c42e615382fa567d8e274e77a65632f878680536eaf2bd77fb13a09dc59ada9 +SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/stable-pre/server/10.8.0-beta2/jellyfin-server_10.8.0~beta2_arm64.deb +SOURCE_SUM=14d502242665a5c01d2abe4facda2c8c18ff2e43631963e5b6ca037811d5915b SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=deb SOURCE_IN_SUBDIR=false diff --git a/conf/server.buster.armhf.src b/conf/server.buster.armhf.src index 1968dd0..e1f60cf 100644 --- a/conf/server.buster.armhf.src +++ b/conf/server.buster.armhf.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/stable/server/10.7.7/jellyfin-server_10.7.7-1_armhf.deb -SOURCE_SUM=685931c972ad044fbdc2ccbea07a5aaf75f93e99562ea799cd6e5a7ac4bdb0cf +SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/stable-pre/server/10.8.0-beta2/jellyfin-server_10.8.0~beta2_armhf.deb +SOURCE_SUM=0a5cb9388f4b75835f5b11adcabbd0691280431b2e62cbc75c5ab1a604b118cb SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=deb SOURCE_IN_SUBDIR=false diff --git a/conf/server.src.default b/conf/server.src.default index fa7d4ba..a36575a 100644 --- a/conf/server.src.default +++ b/conf/server.src.default @@ -1,5 +1,5 @@ -SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/stable/server/__VERSION__/jellyfin-server___PKG_VERSION_____ARCHITECTURE__.deb -SOURCE_SUM=https://repo.jellyfin.org/releases/server/debian/versions/stable/server/__VERSION__/jellyfin-server___PKG_VERSION_____ARCHITECTURE__.deb.sha256sum +SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/stable-pre/server/__VERSION__/jellyfin-server___PKG_VERSION_____ARCHITECTURE__.deb +SOURCE_SUM=https://repo.jellyfin.org/releases/server/debian/versions/stable-pre/server/__VERSION__/jellyfin-server___PKG_VERSION_____ARCHITECTURE__.deb.sha256sum SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=deb SOURCE_IN_SUBDIR=false diff --git a/conf/web.bullseye.amd64.src b/conf/web.bullseye.amd64.src index 25cac6c..f369461 100644 --- a/conf/web.bullseye.amd64.src +++ b/conf/web.bullseye.amd64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/stable/web/10.7.7/jellyfin-web_10.7.7-1_all.deb -SOURCE_SUM=ca06cc1be55cb0393de9cd002e5cd422b7746c68341125b8f4c18907c59647c8 +SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/stable-pre/web/10.8.0-beta2/jellyfin-web_10.8.0~beta2_all.deb +SOURCE_SUM=ac80cf86e4abb15736ce455a418db7239d3da09bbca5ccf8dc8d6c3c30e1aff0 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=deb SOURCE_IN_SUBDIR=false diff --git a/conf/web.bullseye.arm64.src b/conf/web.bullseye.arm64.src index 25cac6c..f369461 100644 --- a/conf/web.bullseye.arm64.src +++ b/conf/web.bullseye.arm64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/stable/web/10.7.7/jellyfin-web_10.7.7-1_all.deb -SOURCE_SUM=ca06cc1be55cb0393de9cd002e5cd422b7746c68341125b8f4c18907c59647c8 +SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/stable-pre/web/10.8.0-beta2/jellyfin-web_10.8.0~beta2_all.deb +SOURCE_SUM=ac80cf86e4abb15736ce455a418db7239d3da09bbca5ccf8dc8d6c3c30e1aff0 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=deb SOURCE_IN_SUBDIR=false diff --git a/conf/web.bullseye.armhf.src b/conf/web.bullseye.armhf.src index 25cac6c..f369461 100644 --- a/conf/web.bullseye.armhf.src +++ b/conf/web.bullseye.armhf.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/stable/web/10.7.7/jellyfin-web_10.7.7-1_all.deb -SOURCE_SUM=ca06cc1be55cb0393de9cd002e5cd422b7746c68341125b8f4c18907c59647c8 +SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/stable-pre/web/10.8.0-beta2/jellyfin-web_10.8.0~beta2_all.deb +SOURCE_SUM=ac80cf86e4abb15736ce455a418db7239d3da09bbca5ccf8dc8d6c3c30e1aff0 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=deb SOURCE_IN_SUBDIR=false diff --git a/conf/web.buster.amd64.src b/conf/web.buster.amd64.src index 25cac6c..f369461 100644 --- a/conf/web.buster.amd64.src +++ b/conf/web.buster.amd64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/stable/web/10.7.7/jellyfin-web_10.7.7-1_all.deb -SOURCE_SUM=ca06cc1be55cb0393de9cd002e5cd422b7746c68341125b8f4c18907c59647c8 +SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/stable-pre/web/10.8.0-beta2/jellyfin-web_10.8.0~beta2_all.deb +SOURCE_SUM=ac80cf86e4abb15736ce455a418db7239d3da09bbca5ccf8dc8d6c3c30e1aff0 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=deb SOURCE_IN_SUBDIR=false diff --git a/conf/web.buster.arm64.src b/conf/web.buster.arm64.src index 25cac6c..f369461 100644 --- a/conf/web.buster.arm64.src +++ b/conf/web.buster.arm64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/stable/web/10.7.7/jellyfin-web_10.7.7-1_all.deb -SOURCE_SUM=ca06cc1be55cb0393de9cd002e5cd422b7746c68341125b8f4c18907c59647c8 +SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/stable-pre/web/10.8.0-beta2/jellyfin-web_10.8.0~beta2_all.deb +SOURCE_SUM=ac80cf86e4abb15736ce455a418db7239d3da09bbca5ccf8dc8d6c3c30e1aff0 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=deb SOURCE_IN_SUBDIR=false diff --git a/conf/web.buster.armhf.src b/conf/web.buster.armhf.src index 25cac6c..f369461 100644 --- a/conf/web.buster.armhf.src +++ b/conf/web.buster.armhf.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/stable/web/10.7.7/jellyfin-web_10.7.7-1_all.deb -SOURCE_SUM=ca06cc1be55cb0393de9cd002e5cd422b7746c68341125b8f4c18907c59647c8 +SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/stable-pre/web/10.8.0-beta2/jellyfin-web_10.8.0~beta2_all.deb +SOURCE_SUM=ac80cf86e4abb15736ce455a418db7239d3da09bbca5ccf8dc8d6c3c30e1aff0 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=deb SOURCE_IN_SUBDIR=false diff --git a/conf/web.src.default b/conf/web.src.default index 9a3a1fc..6aa8ce8 100644 --- a/conf/web.src.default +++ b/conf/web.src.default @@ -1,5 +1,5 @@ -SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/stable/web/__VERSION__/jellyfin-web___PKG_VERSION___all.deb -SOURCE_SUM=https://repo.jellyfin.org/releases/server/debian/versions/stable/web/__VERSION__/jellyfin-web___PKG_VERSION___all.deb.sha256sum +SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/stable-pre/web/__VERSION__/jellyfin-web___PKG_VERSION___all.deb +SOURCE_SUM=https://repo.jellyfin.org/releases/server/debian/versions/stable-pre/web/__VERSION__/jellyfin-web___PKG_VERSION___all.deb.sha256sum SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=deb SOURCE_IN_SUBDIR=false diff --git a/manifest.json b/manifest.json index 3a341aa..ae567c4 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Media System that manage and stream your media.", "fr": "Système multimédia qui gère et diffuse vos médias." }, - "version": "10.7.7~ynh3", + "version": "10.8.0-beta2~ynh1", "url": "https://jellyfin.org", "upstream": { "license": "GPL-2.0-only", diff --git a/scripts/_common.sh b/scripts/_common.sh index 0dbaa82..c4a0bb6 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -5,11 +5,12 @@ #================================================= debian=$(lsb_release --codename --short) -pkg_version="10.7.7-1" -version=$(echo "$pkg_version" | cut -d '-' -f 1) +pkg_version="10.8.0~beta2" +version=10.8.0-beta2 +# version=$(echo "$pkg_version" | cut -d '-' -f 1) -ffmpeg_pkg_version="4.3.2-1" -ldap_pkg_version="12.0.0.0" +ffmpeg_pkg_version="5.0.1-3" +ldap_pkg_version="14.0.0.0" architecture=$(dpkg --print-architecture) @@ -90,7 +91,7 @@ install_jellyfin_packages() { ynh_setup_source --dest_dir=$tempdir --source_id="web.$debian.$architecture" # Install the packages - ynh_exec_warn_less dpkg --force-confdef --force-confnew -i $tempdir/jellyfin-ffmpeg.deb + ynh_exec_warn_less dpkg --force-confdef --force-confnew -i $tempdir/jellyfin-ffmpeg5.deb ynh_exec_warn_less dpkg --force-confdef --force-confnew -i $tempdir/jellyfin-server.deb ynh_exec_warn_less dpkg --force-confdef --force-confnew -i $tempdir/jellyfin-web.deb diff --git a/scripts/remove b/scripts/remove index 31c288c..d00068e 100644 --- a/scripts/remove +++ b/scripts/remove @@ -49,7 +49,7 @@ ynh_script_progression --message="Removing packages..." --weight=1 dpkg --remove jellyfin-web dpkg --remove jellyfin-server -dpkg --remove jellyfin-ffmpeg +dpkg --remove jellyfin-ffmpeg5 #================================================= # REMOVE APP DIRECTORIES From d350302e673ffceee7ab1da665feb54de18228c3 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Sun, 12 Jun 2022 09:49:24 +0200 Subject: [PATCH 14/19] Update versions declarations to 10.8.0 stable --- conf/server.src.default | 4 ++-- conf/web.src.default | 4 ++-- manifest.json | 2 +- scripts/_common.sh | 9 ++++----- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/conf/server.src.default b/conf/server.src.default index a36575a..fa7d4ba 100644 --- a/conf/server.src.default +++ b/conf/server.src.default @@ -1,5 +1,5 @@ -SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/stable-pre/server/__VERSION__/jellyfin-server___PKG_VERSION_____ARCHITECTURE__.deb -SOURCE_SUM=https://repo.jellyfin.org/releases/server/debian/versions/stable-pre/server/__VERSION__/jellyfin-server___PKG_VERSION_____ARCHITECTURE__.deb.sha256sum +SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/stable/server/__VERSION__/jellyfin-server___PKG_VERSION_____ARCHITECTURE__.deb +SOURCE_SUM=https://repo.jellyfin.org/releases/server/debian/versions/stable/server/__VERSION__/jellyfin-server___PKG_VERSION_____ARCHITECTURE__.deb.sha256sum SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=deb SOURCE_IN_SUBDIR=false diff --git a/conf/web.src.default b/conf/web.src.default index 6aa8ce8..9a3a1fc 100644 --- a/conf/web.src.default +++ b/conf/web.src.default @@ -1,5 +1,5 @@ -SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/stable-pre/web/__VERSION__/jellyfin-web___PKG_VERSION___all.deb -SOURCE_SUM=https://repo.jellyfin.org/releases/server/debian/versions/stable-pre/web/__VERSION__/jellyfin-web___PKG_VERSION___all.deb.sha256sum +SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/stable/web/__VERSION__/jellyfin-web___PKG_VERSION___all.deb +SOURCE_SUM=https://repo.jellyfin.org/releases/server/debian/versions/stable/web/__VERSION__/jellyfin-web___PKG_VERSION___all.deb.sha256sum SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=deb SOURCE_IN_SUBDIR=false diff --git a/manifest.json b/manifest.json index ae567c4..b126c30 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Media System that manage and stream your media.", "fr": "Système multimédia qui gère et diffuse vos médias." }, - "version": "10.8.0-beta2~ynh1", + "version": "10.8.0~ynh1", "url": "https://jellyfin.org", "upstream": { "license": "GPL-2.0-only", diff --git a/scripts/_common.sh b/scripts/_common.sh index c4a0bb6..09f5695 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -5,12 +5,11 @@ #================================================= debian=$(lsb_release --codename --short) -pkg_version="10.8.0~beta2" -version=10.8.0-beta2 -# version=$(echo "$pkg_version" | cut -d '-' -f 1) +pkg_version="10.8.0-1" +version=$(echo "$pkg_version" | cut -d '-' -f 1) -ffmpeg_pkg_version="5.0.1-3" -ldap_pkg_version="14.0.0.0" +ffmpeg_pkg_version="5.0.1-5" +ldap_pkg_version="15.0.0.0" architecture=$(dpkg --print-architecture) From 74d3c9f7fa1354ef8ea5b40013bf152c995fb442 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Sun, 12 Jun 2022 09:52:51 +0200 Subject: [PATCH 15/19] Upgrade to v10.8.0 --- conf/ffmpeg.bullseye.amd64.src | 4 ++-- conf/ffmpeg.bullseye.arm64.src | 4 ++-- conf/ffmpeg.bullseye.armhf.src | 4 ++-- conf/ffmpeg.buster.amd64.src | 4 ++-- conf/ffmpeg.buster.arm64.src | 4 ++-- conf/ffmpeg.buster.armhf.src | 4 ++-- conf/ldap.src | 4 ++-- conf/server.bullseye.amd64.src | 4 ++-- conf/server.bullseye.arm64.src | 4 ++-- conf/server.bullseye.armhf.src | 4 ++-- conf/server.buster.amd64.src | 4 ++-- conf/server.buster.arm64.src | 4 ++-- conf/server.buster.armhf.src | 4 ++-- conf/web.bullseye.amd64.src | 4 ++-- conf/web.bullseye.arm64.src | 4 ++-- conf/web.bullseye.armhf.src | 4 ++-- conf/web.buster.amd64.src | 4 ++-- conf/web.buster.arm64.src | 4 ++-- conf/web.buster.armhf.src | 4 ++-- 19 files changed, 38 insertions(+), 38 deletions(-) diff --git a/conf/ffmpeg.bullseye.amd64.src b/conf/ffmpeg.bullseye.amd64.src index 97ec043..d87e0f6 100644 --- a/conf/ffmpeg.bullseye.amd64.src +++ b/conf/ffmpeg.bullseye.amd64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/jellyfin-ffmpeg/5.0.1-3/jellyfin-ffmpeg5_5.0.1-3-bullseye_amd64.deb -SOURCE_SUM=78e0c7594171bf0f10cc2a3c779434c6850c99e6a74a94bd1be0cf320e580b32 +SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/jellyfin-ffmpeg/5.0.1-5/jellyfin-ffmpeg5_5.0.1-5-bullseye_amd64.deb +SOURCE_SUM=8070eb09a73912da19c4659b8f8e8f3aac70bac62601195d15b03c7c419adc55 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=deb SOURCE_IN_SUBDIR=false diff --git a/conf/ffmpeg.bullseye.arm64.src b/conf/ffmpeg.bullseye.arm64.src index 444fe50..409b725 100644 --- a/conf/ffmpeg.bullseye.arm64.src +++ b/conf/ffmpeg.bullseye.arm64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/jellyfin-ffmpeg/5.0.1-3/jellyfin-ffmpeg5_5.0.1-3-bullseye_arm64.deb -SOURCE_SUM=5a85f9a2a720f03dea645eaa3ecfadc46d743f9ae82e8bbad9d1aaa7d5f9cc6b +SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/jellyfin-ffmpeg/5.0.1-5/jellyfin-ffmpeg5_5.0.1-5-bullseye_arm64.deb +SOURCE_SUM=7aeff16cee434c1732ab3a7b6bfc949b2714b6bd432fff147fe8bb9424de85c8 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=deb SOURCE_IN_SUBDIR=false diff --git a/conf/ffmpeg.bullseye.armhf.src b/conf/ffmpeg.bullseye.armhf.src index a7d9d6a..f5fd72b 100644 --- a/conf/ffmpeg.bullseye.armhf.src +++ b/conf/ffmpeg.bullseye.armhf.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/jellyfin-ffmpeg/5.0.1-3/jellyfin-ffmpeg5_5.0.1-3-bullseye_armhf.deb -SOURCE_SUM=52fe443d8cf69714133535da88c5e40e0f30fda2d73d1dee4a9c57d56e51a0e2 +SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/jellyfin-ffmpeg/5.0.1-5/jellyfin-ffmpeg5_5.0.1-5-bullseye_armhf.deb +SOURCE_SUM=ae59fc84b52176618debebf211dcba083663a4bb82747a320bee64558cfb6ccc SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=deb SOURCE_IN_SUBDIR=false diff --git a/conf/ffmpeg.buster.amd64.src b/conf/ffmpeg.buster.amd64.src index 81dc061..b3d8d87 100644 --- a/conf/ffmpeg.buster.amd64.src +++ b/conf/ffmpeg.buster.amd64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/jellyfin-ffmpeg/5.0.1-3/jellyfin-ffmpeg5_5.0.1-3-buster_amd64.deb -SOURCE_SUM=168c9fac392d2ac8a1faba94ac8cf059efec6762aa8ad2d3b66396fddbbc675b +SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/jellyfin-ffmpeg/5.0.1-5/jellyfin-ffmpeg5_5.0.1-5-buster_amd64.deb +SOURCE_SUM=d1079c74f6d644fb7accf02232583e3c78100c57c5af8c24914d67250cdb3d0d SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=deb SOURCE_IN_SUBDIR=false diff --git a/conf/ffmpeg.buster.arm64.src b/conf/ffmpeg.buster.arm64.src index 7222694..414f4ee 100644 --- a/conf/ffmpeg.buster.arm64.src +++ b/conf/ffmpeg.buster.arm64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/jellyfin-ffmpeg/5.0.1-3/jellyfin-ffmpeg5_5.0.1-3-buster_arm64.deb -SOURCE_SUM=5aa1feb2926bb678bb99e9f7192a20d27cbec94d86c370ca736a5b9ba648e0af +SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/jellyfin-ffmpeg/5.0.1-5/jellyfin-ffmpeg5_5.0.1-5-buster_arm64.deb +SOURCE_SUM=3c732da2f365faf7c7c859602e07da114ba63dcac69c54daa8403171c6a955ec SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=deb SOURCE_IN_SUBDIR=false diff --git a/conf/ffmpeg.buster.armhf.src b/conf/ffmpeg.buster.armhf.src index d8c6000..0a8456c 100644 --- a/conf/ffmpeg.buster.armhf.src +++ b/conf/ffmpeg.buster.armhf.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/jellyfin-ffmpeg/5.0.1-3/jellyfin-ffmpeg5_5.0.1-3-buster_armhf.deb -SOURCE_SUM=3a3655b11ba9b9acfb79568ecd6a04074ccf8d843893bb5dd1f1d50565d6e455 +SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/jellyfin-ffmpeg/5.0.1-5/jellyfin-ffmpeg5_5.0.1-5-buster_armhf.deb +SOURCE_SUM=8c3d65b68e56b1ee26dec1727f514946e04bd4fefab9b40c2df12f3d80f54ba6 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=deb SOURCE_IN_SUBDIR=false diff --git a/conf/ldap.src b/conf/ldap.src index 747ef84..c905494 100644 --- a/conf/ldap.src +++ b/conf/ldap.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://repo.jellyfin.org/releases/plugin/ldap-authentication/ldap-authentication_14.0.0.0.zip -SOURCE_SUM=2306435e74d0a48bb41d83e000461136ab5a77fff5636fc246a90859701a29c1 +SOURCE_URL=https://repo.jellyfin.org/releases/plugin/ldap-authentication/ldap-authentication_15.0.0.0.zip +SOURCE_SUM=e0fa2ee4ec0bbe3a6f56fd5775abe1dd41cde88f05d9c085e9135cda4680c00c SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=false diff --git a/conf/server.bullseye.amd64.src b/conf/server.bullseye.amd64.src index 56eb254..d15c726 100644 --- a/conf/server.bullseye.amd64.src +++ b/conf/server.bullseye.amd64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/stable-pre/server/10.8.0-beta2/jellyfin-server_10.8.0~beta2_amd64.deb -SOURCE_SUM=4f902f461e491090fd20c5285fdf1c465011c9107f08e98eaba938611e975228 +SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/stable/server/10.8.0/jellyfin-server_10.8.0-1_amd64.deb +SOURCE_SUM=af0b6133fe9df3b9096c3cd329a4a7df1664279a3903f47e8b003670305ac761 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=deb SOURCE_IN_SUBDIR=false diff --git a/conf/server.bullseye.arm64.src b/conf/server.bullseye.arm64.src index 4f4d227..cabe1f0 100644 --- a/conf/server.bullseye.arm64.src +++ b/conf/server.bullseye.arm64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/stable-pre/server/10.8.0-beta2/jellyfin-server_10.8.0~beta2_arm64.deb -SOURCE_SUM=14d502242665a5c01d2abe4facda2c8c18ff2e43631963e5b6ca037811d5915b +SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/stable/server/10.8.0/jellyfin-server_10.8.0-1_arm64.deb +SOURCE_SUM=1e594290beb3128f03221c4e5bcaa5b2f8fada1ade519fcc60d12f466fd090ec SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=deb SOURCE_IN_SUBDIR=false diff --git a/conf/server.bullseye.armhf.src b/conf/server.bullseye.armhf.src index e1f60cf..f2e3900 100644 --- a/conf/server.bullseye.armhf.src +++ b/conf/server.bullseye.armhf.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/stable-pre/server/10.8.0-beta2/jellyfin-server_10.8.0~beta2_armhf.deb -SOURCE_SUM=0a5cb9388f4b75835f5b11adcabbd0691280431b2e62cbc75c5ab1a604b118cb +SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/stable/server/10.8.0/jellyfin-server_10.8.0-1_armhf.deb +SOURCE_SUM=4acfcdb8f70fb57615ea66fdbf400b9e1a990bd95439b94479fd101cf657c340 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=deb SOURCE_IN_SUBDIR=false diff --git a/conf/server.buster.amd64.src b/conf/server.buster.amd64.src index 56eb254..d15c726 100644 --- a/conf/server.buster.amd64.src +++ b/conf/server.buster.amd64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/stable-pre/server/10.8.0-beta2/jellyfin-server_10.8.0~beta2_amd64.deb -SOURCE_SUM=4f902f461e491090fd20c5285fdf1c465011c9107f08e98eaba938611e975228 +SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/stable/server/10.8.0/jellyfin-server_10.8.0-1_amd64.deb +SOURCE_SUM=af0b6133fe9df3b9096c3cd329a4a7df1664279a3903f47e8b003670305ac761 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=deb SOURCE_IN_SUBDIR=false diff --git a/conf/server.buster.arm64.src b/conf/server.buster.arm64.src index 4f4d227..cabe1f0 100644 --- a/conf/server.buster.arm64.src +++ b/conf/server.buster.arm64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/stable-pre/server/10.8.0-beta2/jellyfin-server_10.8.0~beta2_arm64.deb -SOURCE_SUM=14d502242665a5c01d2abe4facda2c8c18ff2e43631963e5b6ca037811d5915b +SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/stable/server/10.8.0/jellyfin-server_10.8.0-1_arm64.deb +SOURCE_SUM=1e594290beb3128f03221c4e5bcaa5b2f8fada1ade519fcc60d12f466fd090ec SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=deb SOURCE_IN_SUBDIR=false diff --git a/conf/server.buster.armhf.src b/conf/server.buster.armhf.src index e1f60cf..f2e3900 100644 --- a/conf/server.buster.armhf.src +++ b/conf/server.buster.armhf.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/stable-pre/server/10.8.0-beta2/jellyfin-server_10.8.0~beta2_armhf.deb -SOURCE_SUM=0a5cb9388f4b75835f5b11adcabbd0691280431b2e62cbc75c5ab1a604b118cb +SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/stable/server/10.8.0/jellyfin-server_10.8.0-1_armhf.deb +SOURCE_SUM=4acfcdb8f70fb57615ea66fdbf400b9e1a990bd95439b94479fd101cf657c340 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=deb SOURCE_IN_SUBDIR=false diff --git a/conf/web.bullseye.amd64.src b/conf/web.bullseye.amd64.src index f369461..ff02d56 100644 --- a/conf/web.bullseye.amd64.src +++ b/conf/web.bullseye.amd64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/stable-pre/web/10.8.0-beta2/jellyfin-web_10.8.0~beta2_all.deb -SOURCE_SUM=ac80cf86e4abb15736ce455a418db7239d3da09bbca5ccf8dc8d6c3c30e1aff0 +SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/stable/web/10.8.0/jellyfin-web_10.8.0-1_all.deb +SOURCE_SUM=f5e5861f3e9941cef17fbd04d294a6f538f258f6167ef5201b97632167cd3af4 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=deb SOURCE_IN_SUBDIR=false diff --git a/conf/web.bullseye.arm64.src b/conf/web.bullseye.arm64.src index f369461..ff02d56 100644 --- a/conf/web.bullseye.arm64.src +++ b/conf/web.bullseye.arm64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/stable-pre/web/10.8.0-beta2/jellyfin-web_10.8.0~beta2_all.deb -SOURCE_SUM=ac80cf86e4abb15736ce455a418db7239d3da09bbca5ccf8dc8d6c3c30e1aff0 +SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/stable/web/10.8.0/jellyfin-web_10.8.0-1_all.deb +SOURCE_SUM=f5e5861f3e9941cef17fbd04d294a6f538f258f6167ef5201b97632167cd3af4 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=deb SOURCE_IN_SUBDIR=false diff --git a/conf/web.bullseye.armhf.src b/conf/web.bullseye.armhf.src index f369461..ff02d56 100644 --- a/conf/web.bullseye.armhf.src +++ b/conf/web.bullseye.armhf.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/stable-pre/web/10.8.0-beta2/jellyfin-web_10.8.0~beta2_all.deb -SOURCE_SUM=ac80cf86e4abb15736ce455a418db7239d3da09bbca5ccf8dc8d6c3c30e1aff0 +SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/stable/web/10.8.0/jellyfin-web_10.8.0-1_all.deb +SOURCE_SUM=f5e5861f3e9941cef17fbd04d294a6f538f258f6167ef5201b97632167cd3af4 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=deb SOURCE_IN_SUBDIR=false diff --git a/conf/web.buster.amd64.src b/conf/web.buster.amd64.src index f369461..ff02d56 100644 --- a/conf/web.buster.amd64.src +++ b/conf/web.buster.amd64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/stable-pre/web/10.8.0-beta2/jellyfin-web_10.8.0~beta2_all.deb -SOURCE_SUM=ac80cf86e4abb15736ce455a418db7239d3da09bbca5ccf8dc8d6c3c30e1aff0 +SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/stable/web/10.8.0/jellyfin-web_10.8.0-1_all.deb +SOURCE_SUM=f5e5861f3e9941cef17fbd04d294a6f538f258f6167ef5201b97632167cd3af4 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=deb SOURCE_IN_SUBDIR=false diff --git a/conf/web.buster.arm64.src b/conf/web.buster.arm64.src index f369461..ff02d56 100644 --- a/conf/web.buster.arm64.src +++ b/conf/web.buster.arm64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/stable-pre/web/10.8.0-beta2/jellyfin-web_10.8.0~beta2_all.deb -SOURCE_SUM=ac80cf86e4abb15736ce455a418db7239d3da09bbca5ccf8dc8d6c3c30e1aff0 +SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/stable/web/10.8.0/jellyfin-web_10.8.0-1_all.deb +SOURCE_SUM=f5e5861f3e9941cef17fbd04d294a6f538f258f6167ef5201b97632167cd3af4 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=deb SOURCE_IN_SUBDIR=false diff --git a/conf/web.buster.armhf.src b/conf/web.buster.armhf.src index f369461..ff02d56 100644 --- a/conf/web.buster.armhf.src +++ b/conf/web.buster.armhf.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/stable-pre/web/10.8.0-beta2/jellyfin-web_10.8.0~beta2_all.deb -SOURCE_SUM=ac80cf86e4abb15736ce455a418db7239d3da09bbca5ccf8dc8d6c3c30e1aff0 +SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/stable/web/10.8.0/jellyfin-web_10.8.0-1_all.deb +SOURCE_SUM=f5e5861f3e9941cef17fbd04d294a6f538f258f6167ef5201b97632167cd3af4 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=deb SOURCE_IN_SUBDIR=false From d4533db82318c34fe491d178520b00e975f05fab Mon Sep 17 00:00:00 2001 From: tituspijean Date: Sun, 12 Jun 2022 10:04:00 +0200 Subject: [PATCH 16/19] Add missing ffmpeg dependencies --- scripts/_common.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/_common.sh b/scripts/_common.sh index 09f5695..fa90e2e 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -27,6 +27,7 @@ ffmpeg_deps=( libgcc1 libgmp10 libgnutls30 + libllvm11 libmp3lame0 libopus0 libstdc++6 @@ -37,6 +38,7 @@ ffmpeg_deps=( libwebp6 libwebpmux3 libx11-6 + libxcb-randr0 libzvbi0 zlib1g ) From 7c0cede8fb53e1df6f271b6fc7b5eeee4e36f0ca Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 12 Jun 2022 18:07:40 +0000 Subject: [PATCH 17/19] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 142a261..4c212f4 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Media System that manage and stream your media. -**Shipped version:** 10.7.7~ynh3 +**Shipped version:** 10.8.0~ynh1 **Demo:** https://demo.jellyfin.org/stable/web/index.html diff --git a/README_fr.md b/README_fr.md index b1cd487..a9f4c67 100644 --- a/README_fr.md +++ b/README_fr.md @@ -17,7 +17,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Système multimédia qui gère et diffuse vos médias. -**Version incluse :** 10.7.7~ynh3 +**Version incluse :** 10.8.0~ynh1 **Démo :** https://demo.jellyfin.org/stable/web/index.html From d124083ec097fbdadd7584cf86b7b59c1ff2f6c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Sun, 12 Jun 2022 20:30:12 +0200 Subject: [PATCH 18/19] Fix: ffmpeg -> ffmpeg5 --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index fa90e2e..37b14c1 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -100,7 +100,7 @@ install_jellyfin_packages() { # but the code says multiple calls are supported. # Also, they're already installed so that should be quasi instantaneous. ynh_install_app_dependencies \ - jellyfin-ffmpeg="$ffmpeg_pkg_version-$debian" \ + jellyfin-ffmpeg5="$ffmpeg_pkg_version-$debian" \ jellyfin-server="$pkg_version" \ jellyfin-web="$pkg_version" } From 384dcd2ff1dbf4b0085edb7f12e4d15f00508e2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Mon, 13 Jun 2022 19:40:14 +0200 Subject: [PATCH 19/19] Fix restore by using YNH_APP_BASEDIR. Factorize code. Cleanup temporary directory. --- scripts/_common.sh | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 37b14c1..ad67e18 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -66,22 +66,15 @@ install_jellyfin_packages() { # In case of a new version, the url change from # https://repo.jellyfin.org/releases/server/debian/versions/stable/server/X.X.X/jellyfin-server_X.X.X-1_$architecture.deb to # https://repo.jellyfin.org/archive/debian/stable/X.X.X/server/jellyfin-server_X.X.X-1_$architecture.deb - src_url=$(grep 'SOURCE_URL=' "../conf/server.$debian.$architecture.src" | cut -d= -f2-) - if ! curl --output /dev/null --silent --head --fail "$src_url"; then - ynh_replace_string \ - --match_string="releases/server/debian/versions/stable/server/$version/" \ - --replace_string="archive/debian/stable/$version/server/" \ - --target_file="../conf/server.$debian.$architecture.src" - fi - - # Same for web - src_url=$(grep 'SOURCE_URL=' "../conf/web.$debian.$architecture.src" | cut -d= -f2-) - if ! curl --output /dev/null --silent --head --fail "$src_url"; then - ynh_replace_string \ - --match_string="releases/server/debian/versions/stable/web/$version/" \ - --replace_string="archive/debian/stable/$version/web/" \ - --target_file="../conf/web.$debian.$architecture.src" - fi + for pkg in web server; do + src_url=$(grep 'SOURCE_URL=' "$YNH_APP_BASEDIR/conf/$pkg.$debian.$architecture.src" | cut -d= -f2-) + if ! curl --output /dev/null --silent --head --fail "$src_url"; then + ynh_replace_string \ + --match_string="releases/server/debian/versions/stable/$pkg/$version/" \ + --replace_string="archive/debian/stable/$version/$pkg/" \ + --target_file="$YNH_APP_BASEDIR/conf/$pkg.$debian.$architecture.src" + fi + done # Create the temporary directory tempdir="$(mktemp -d)" @@ -96,6 +89,8 @@ install_jellyfin_packages() { ynh_exec_warn_less dpkg --force-confdef --force-confnew -i $tempdir/jellyfin-server.deb ynh_exec_warn_less dpkg --force-confdef --force-confnew -i $tempdir/jellyfin-web.deb + rm -rf "$tempdir" + # The doc says it should be called only once, # but the code says multiple calls are supported. # Also, they're already installed so that should be quasi instantaneous.