From 668dcffe482b28bbd56cee69aaf030dda9333249 Mon Sep 17 00:00:00 2001 From: liberodark Date: Fri, 26 Jul 2019 10:30:04 +0200 Subject: [PATCH 01/10] Update app.src --- conf/app.src | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/app.src b/conf/app.src index 758b4fe..85fc1b5 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/jellyfin/jellyfin/releases/download/v10.2.2/jellyfin_10.2.2-1_debian-amd64.deb -SOURCE_SUM=7a4cc63fd8dfd5535717eae931151dead66293b37246110330dfc1174dac72f3abde75477efed4983c0d2c51331c0efa6ef5b544a2579db6cdd21e80b114eb5c +SOURCE_URL=https://github.com/jellyfin/jellyfin/releases/download/v10.3.7/jellyfin_10.3.7-1_debian-amd64.deb +SOURCE_SUM=8d50ddcf8a222d3bab2e3a51c4e8d824889edcb4e76e6df4dbfc68fccfd30420937a598e7d1e3c9832cace5aa038536a8d32dfc82d33d419f6d8b9d52880682e SOURCE_SUM_PRG=sha512sum SOURCE_FORMAT=deb SOURCE_IN_SUBDIR=false From fa8f748ab632ba57ded0791487a34fff26803c74 Mon Sep 17 00:00:00 2001 From: liberodark Date: Fri, 26 Jul 2019 10:30:32 +0200 Subject: [PATCH 02/10] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 726870d..63415d1 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Jellyfin app for YunoHost Jellyfin Server -**Shipped version:** 10.2.2 +**Shipped version:** 10.3.7 - [Yunohost project](https://yunohost.org) - [Jellyfin website](https://github.com/jellyfin/jellyfin) From fcdf89fc2889d145cdc0c187dd7f5e768329dec6 Mon Sep 17 00:00:00 2001 From: liberodark Date: Fri, 26 Jul 2019 10:30:51 +0200 Subject: [PATCH 03/10] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 0232f54..e335b45 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Jellyfin package for YunoHost.", "fr": "Jellyfin pour YunoHost." }, - "version": "10.2.2", + "version": "10.3.7", "url": "https://github.com/jellyfin/jellyfin", "license": "GPL-2.0", "maintainer": { From f346fca516d99f2c130fe34cbced12c2b833f5ec Mon Sep 17 00:00:00 2001 From: liberodark Date: Wed, 31 Jul 2019 03:01:22 +0200 Subject: [PATCH 04/10] Update install --- scripts/install | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/scripts/install b/scripts/install index 025c0c0..dd597f7 100644 --- a/scripts/install +++ b/scripts/install @@ -79,12 +79,13 @@ ynh_print_info "Installing dependencies..." ### - As well as the section "REINSTALL DEPENDENCIES" in the restore script ### - And the section "UPGRADE DEPENDENCIES" in the upgrade script -wget -O - https://repo.jellyfin.org/debian/jellyfin_team.gpg.key | apt-key add - -echo "deb [arch=amd64] https://repo.jellyfin.org/debian $( lsb_release -c -s ) main" >> /etc/apt/sources.list.d/jellyfin.list +#wget -O - https://repo.jellyfin.org/debian/jellyfin_team.gpg.key | apt-key add - +#echo "deb [arch=$( dpkg --print-architecture )] https://repo.jellyfin.org/debian $( lsb_release -c -s ) main" | tee /etc/apt/sources.list.d/jellyfin.list +#echo "deb [arch=amd64] https://repo.jellyfin.org/debian $( lsb_release -c -s ) main" >> /etc/apt/sources.list.d/jellyfin.list -ynh_package_update +#ynh_package_update -ynh_install_app_dependencies jellyfin +#ynh_install_app_dependencies jellyfin #================================================= # FIND AND OPEN A PORT @@ -101,6 +102,21 @@ port=$(ynh_find_port 8096) yunohost firewall allow --no-upnp TCP $port 2>&1 ynh_app_setting_set $app port $port +#================================================= +# DOWNLOAD, CHECK AND UNPACK SOURCE +#================================================= + +ynh_app_setting_set $app final_path $final_path +# Download, check integrity, uncompress and patch the source from app.src +ynh_setup_source "$final_path" + + +#============================================== +# INSTALL JELLYFIN +#============================================== + +dpkg --install $final_path/jellyfin.deb + #================================================= # NGINX CONFIGURATION #================================================= From 222e7b6dfe4a715096e99e15ddb65ab16e06575d Mon Sep 17 00:00:00 2001 From: liberodark Date: Wed, 31 Jul 2019 03:07:02 +0200 Subject: [PATCH 05/10] Create jellyfin-ffmpeg.src --- conf/jellyfin-ffmpeg.src | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 conf/jellyfin-ffmpeg.src diff --git a/conf/jellyfin-ffmpeg.src b/conf/jellyfin-ffmpeg.src new file mode 100644 index 0000000..544b999 --- /dev/null +++ b/conf/jellyfin-ffmpeg.src @@ -0,0 +1,7 @@ +SOURCE_URL=https://github.com/jellyfin/jellyfin/releases/download/v10.2.2/jellyfin_10.2.2-1_debian-amd64.deb +SOURCE_SUM=7a4cc63fd8dfd5535717eae931151dead66293b37246110330dfc1174dac72f3abde75477efed4983c0d2c51331c0efa6ef5b544a2579db6cdd21e80b114eb5c +SOURCE_SUM_PRG=sha512sum +SOURCE_FORMAT=deb +SOURCE_IN_SUBDIR=false +SOURCE_EXTRACT=false +SOURCE_FILENAME=jellyfin-ffmpeg.deb From 7348b003818e7d9144b007dbbe4bc6e53618b1f8 Mon Sep 17 00:00:00 2001 From: liberodark Date: Wed, 31 Jul 2019 03:07:35 +0200 Subject: [PATCH 06/10] Update jellyfin-ffmpeg.src --- conf/jellyfin-ffmpeg.src | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/jellyfin-ffmpeg.src b/conf/jellyfin-ffmpeg.src index 544b999..88636c9 100644 --- a/conf/jellyfin-ffmpeg.src +++ b/conf/jellyfin-ffmpeg.src @@ -1,5 +1,5 @@ SOURCE_URL=https://github.com/jellyfin/jellyfin/releases/download/v10.2.2/jellyfin_10.2.2-1_debian-amd64.deb -SOURCE_SUM=7a4cc63fd8dfd5535717eae931151dead66293b37246110330dfc1174dac72f3abde75477efed4983c0d2c51331c0efa6ef5b544a2579db6cdd21e80b114eb5c +SOURCE_SUM=b3bad07eff89f825385a0424a6c7a53c010455fe1ffe7beca3fb8f27a9dd35cdf2b445e00e1b0b8ee1ffe40967a9ed87bb954bc6abdd1b1bf03229ef53615bae SOURCE_SUM_PRG=sha512sum SOURCE_FORMAT=deb SOURCE_IN_SUBDIR=false From 98442c84e55235d89eaa9c56fde8e2783d8af81a Mon Sep 17 00:00:00 2001 From: liberodark Date: Wed, 31 Jul 2019 03:09:47 +0200 Subject: [PATCH 07/10] Update install --- scripts/install | 26 +++++--------------------- 1 file changed, 5 insertions(+), 21 deletions(-) diff --git a/scripts/install b/scripts/install index dd597f7..5fa7947 100644 --- a/scripts/install +++ b/scripts/install @@ -66,27 +66,6 @@ ynh_app_setting_set $app domain $domain ynh_app_setting_set $app path $path_url ynh_app_setting_set $app is_public $is_public -#================================================= -# INSTALL DEPENDENCIES -#================================================= - -ynh_print_info "Installing dependencies..." - -### `ynh_install_app_dependencies` allows you to add any "apt" dependencies to the package. -### Those deb packages will be installed as dependencies of this package. -### If you're not using this helper: -### - Remove the section "REMOVE DEPENDENCIES" in the remove script -### - As well as the section "REINSTALL DEPENDENCIES" in the restore script -### - And the section "UPGRADE DEPENDENCIES" in the upgrade script - -#wget -O - https://repo.jellyfin.org/debian/jellyfin_team.gpg.key | apt-key add - -#echo "deb [arch=$( dpkg --print-architecture )] https://repo.jellyfin.org/debian $( lsb_release -c -s ) main" | tee /etc/apt/sources.list.d/jellyfin.list -#echo "deb [arch=amd64] https://repo.jellyfin.org/debian $( lsb_release -c -s ) main" >> /etc/apt/sources.list.d/jellyfin.list - -#ynh_package_update - -#ynh_install_app_dependencies jellyfin - #================================================= # FIND AND OPEN A PORT #================================================= @@ -106,6 +85,10 @@ ynh_app_setting_set $app port $port # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= +ynh_app_setting_set $jellyfin-ffmpeg final_path $final_path +# Download, check integrity, uncompress and patch the source from app.src +ynh_setup_source "$final_path" + ynh_app_setting_set $app final_path $final_path # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source "$final_path" @@ -115,6 +98,7 @@ ynh_setup_source "$final_path" # INSTALL JELLYFIN #============================================== +dpkg --install $final_path/jellyfin-ffmpeg.deb dpkg --install $final_path/jellyfin.deb #================================================= From 0ce1ba42e1aad31d8fcc17b460cebaeaa25b9920 Mon Sep 17 00:00:00 2001 From: liberodark Date: Wed, 31 Jul 2019 03:11:14 +0200 Subject: [PATCH 08/10] Update app.src --- conf/app.src | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/app.src b/conf/app.src index 85fc1b5..fcfb55a 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,4 +1,4 @@ -SOURCE_URL=https://github.com/jellyfin/jellyfin/releases/download/v10.3.7/jellyfin_10.3.7-1_debian-amd64.deb +SOURCE_URL=https://github.com/YunoHost-Apps/jellyfin_ynh/releases/download/10.3.7/jellyfin_10.3.7-1_amd64.deb SOURCE_SUM=8d50ddcf8a222d3bab2e3a51c4e8d824889edcb4e76e6df4dbfc68fccfd30420937a598e7d1e3c9832cace5aa038536a8d32dfc82d33d419f6d8b9d52880682e SOURCE_SUM_PRG=sha512sum SOURCE_FORMAT=deb From 8c1296d214263cff24a5c410cd86526addacf550 Mon Sep 17 00:00:00 2001 From: liberodark Date: Wed, 31 Jul 2019 03:11:30 +0200 Subject: [PATCH 09/10] Update jellyfin-ffmpeg.src --- conf/jellyfin-ffmpeg.src | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/jellyfin-ffmpeg.src b/conf/jellyfin-ffmpeg.src index 88636c9..dc880da 100644 --- a/conf/jellyfin-ffmpeg.src +++ b/conf/jellyfin-ffmpeg.src @@ -1,4 +1,4 @@ -SOURCE_URL=https://github.com/jellyfin/jellyfin/releases/download/v10.2.2/jellyfin_10.2.2-1_debian-amd64.deb +SOURCE_URL=https://github.com/YunoHost-Apps/jellyfin_ynh/releases/download/10.3.7/jellyfin-ffmpeg_4.0.4-3-stretch_amd64.deb SOURCE_SUM=b3bad07eff89f825385a0424a6c7a53c010455fe1ffe7beca3fb8f27a9dd35cdf2b445e00e1b0b8ee1ffe40967a9ed87bb954bc6abdd1b1bf03229ef53615bae SOURCE_SUM_PRG=sha512sum SOURCE_FORMAT=deb From e468307b846cb8518680cbd7298bf0bf5ddbaf71 Mon Sep 17 00:00:00 2001 From: liberodark Date: Wed, 31 Jul 2019 03:13:19 +0200 Subject: [PATCH 10/10] Update install --- scripts/install | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/install b/scripts/install index 5fa7947..3c9ab67 100644 --- a/scripts/install +++ b/scripts/install @@ -159,4 +159,6 @@ if [ $is_public -eq 1 ]; then fi # Reload services +systemctl enable jellyfin +systemctl start jellyfin systemctl reload nginx