diff --git a/README.md b/README.md index 5152b2d..15ee94f 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Jellyfin app for YunoHost Jellyfin Server -**Shipped version:** 10.5.5 +**Shipped version:** 10.6.0 - [Yunohost project](https://yunohost.org) - [Jellyfin website](https://github.com/jellyfin/jellyfin) diff --git a/conf/jellyfin-amd64.src b/conf/jellyfin-amd64.src deleted file mode 100644 index b62bfa4..0000000 --- a/conf/jellyfin-amd64.src +++ /dev/null @@ -1,7 +0,0 @@ -SOURCE_URL=https://github.com/jellyfin/jellyfin/releases/download/v10.5.5/jellyfin_10.5.5-1_debian-amd64.deb -SOURCE_SUM=a9b1daae02196b47cef679140208372c4803e70a77cdeafdb3e403ee55c980071415957c54105056ad09d0ba38c78646d572af860e6585beec4debcac7ef4fac -SOURCE_SUM_PRG=sha512sum -SOURCE_FORMAT=deb -SOURCE_IN_SUBDIR=false -SOURCE_EXTRACT=false -SOURCE_FILENAME=jellyfin.deb diff --git a/conf/jellyfin-arm64.src b/conf/jellyfin-arm64.src deleted file mode 100644 index 8e75c32..0000000 --- a/conf/jellyfin-arm64.src +++ /dev/null @@ -1,7 +0,0 @@ -SOURCE_URL=https://github.com/jellyfin/jellyfin/releases/download/v10.5.5/jellyfin_10.5.5-1_debian-arm64.deb -SOURCE_SUM=20b396e54f60acafd6d7c7130f8999b034dc93aeec3adc866e2dc5911c70edae1e55943e2f0dc6d20911fd44c9310bdd822a34f579fecb6810ed5ebb867f0f59 -SOURCE_SUM_PRG=sha512sum -SOURCE_FORMAT=deb -SOURCE_IN_SUBDIR=false -SOURCE_EXTRACT=false -SOURCE_FILENAME=jellyfin.deb diff --git a/conf/jellyfin-armhf.src b/conf/jellyfin-armhf.src deleted file mode 100644 index 80717a4..0000000 --- a/conf/jellyfin-armhf.src +++ /dev/null @@ -1,7 +0,0 @@ -SOURCE_URL=https://github.com/jellyfin/jellyfin/releases/download/v10.5.5/jellyfin_10.5.5-1_debian-armhf.deb -SOURCE_SUM=aa38ca396f50021c771ce759616b15aee1385d1956c36fa0b55bcbf37807eef72f4a905681f5b6a873ad5f712e0e2251df57a93f1b50c2599c7350a6016cca0c -SOURCE_SUM_PRG=sha512sum -SOURCE_FORMAT=deb -SOURCE_IN_SUBDIR=false -SOURCE_EXTRACT=false -SOURCE_FILENAME=jellyfin.deb diff --git a/conf/jellyfin-ffmpeg-arm64.src b/conf/jellyfin-ffmpeg-arm64.src index 051cd00..0b25190 100644 --- a/conf/jellyfin-ffmpeg-arm64.src +++ b/conf/jellyfin-ffmpeg-arm64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/jellyfin/jellyfin-ffmpeg/releases/download/v4.2.1-7/jellyfin-ffmpeg_4.2.1-7-stretch_arm64.deb -SOURCE_SUM=8d3adbfb59c90ef34b17b57a92450dea1b46389e4f8428ff59c667248b09f38a9b0b450214d005d1208b11ad905819817378274f9e1b5ac2751871026adbe058 +SOURCE_URL=https://github.com/YunoHost-Apps/jellyfin_ynh/releases/download/10.6.0/jellyfin-ffmpeg_4.3.1-1-stretch_arm64.deb +SOURCE_SUM=17ca53a20ab0668f2d5762f0a183c6bcf192cc901e3223e670d7f5c9d7d0c6c7da432f0cdb2fe98108f84d4cb3ac775f84cf5816b8d43d2080a280dab8ba6c32 SOURCE_SUM_PRG=sha512sum SOURCE_FORMAT=deb SOURCE_IN_SUBDIR=false diff --git a/conf/jellyfin-server-amd64.src b/conf/jellyfin-server-amd64.src new file mode 100644 index 0000000..8bb51b9 --- /dev/null +++ b/conf/jellyfin-server-amd64.src @@ -0,0 +1,7 @@ +SOURCE_URL=https://github.com/YunoHost-Apps/jellyfin_ynh/releases/download/10.6.0/jellyfin-server_10.6.0-2_amd64.deb +SOURCE_SUM=5c997a4fc5abb384f9cf7ddccea4099c604efe1cb818a71a2b962d6656b75689f979893df82f5781a9f078752635d3139cd8d76dda30c2d6a75ed2f8413ecaea +SOURCE_SUM_PRG=sha512sum +SOURCE_FORMAT=deb +SOURCE_IN_SUBDIR=false +SOURCE_EXTRACT=false +SOURCE_FILENAME=jellyfin-server.deb diff --git a/conf/jellyfin-server-arm64.src b/conf/jellyfin-server-arm64.src new file mode 100644 index 0000000..ddc2da1 --- /dev/null +++ b/conf/jellyfin-server-arm64.src @@ -0,0 +1,7 @@ +SOURCE_URL=https://github.com/YunoHost-Apps/jellyfin_ynh/releases/download/10.6.0/jellyfin-server_10.6.0-2_arm64.deb +SOURCE_SUM=48597274832a2d4a915824db94dc089c87c83e5857a77e33d6ea79636961221fa20d3c10569e6ab9adcb369beacc507dca52b466e39bafa3297b31102f0fbeab +SOURCE_SUM_PRG=sha512sum +SOURCE_FORMAT=deb +SOURCE_IN_SUBDIR=false +SOURCE_EXTRACT=false +SOURCE_FILENAME=jellyfin-server.deb diff --git a/conf/jellyfin-server-armhf.src b/conf/jellyfin-server-armhf.src new file mode 100644 index 0000000..4ef2155 --- /dev/null +++ b/conf/jellyfin-server-armhf.src @@ -0,0 +1,7 @@ +SOURCE_URL=https://github.com/YunoHost-Apps/jellyfin_ynh/releases/download/10.6.0/jellyfin-server_10.6.0-2_armhf.deb +SOURCE_SUM=cad9bac01c75a380ce0ad138baa9bdc946a7485f71c697a04e1c737a53d5152ed62e4d50b49f216e85f2c154445ba43f47e3ff51ecb7ccac5cdd0b0ea4192a27 +SOURCE_SUM_PRG=sha512sum +SOURCE_FORMAT=deb +SOURCE_IN_SUBDIR=false +SOURCE_EXTRACT=false +SOURCE_FILENAME=jellyfin-server.deb diff --git a/conf/jellyfin-web.src b/conf/jellyfin-web.src new file mode 100644 index 0000000..6dfb672 --- /dev/null +++ b/conf/jellyfin-web.src @@ -0,0 +1,7 @@ +SOURCE_URL=https://github.com/YunoHost-Apps/jellyfin_ynh/releases/download/10.6.0/jellyfin-web_10.6.0-1_all.deb +SOURCE_SUM=6c29032cee43bb2a2f6a41f824874ba7c43fa7055203f2099a6273f14922536e307b75ad67c4838a93b6a4c2c72e62f889f6da8944fda40ed0da22d98ad29aee +SOURCE_SUM_PRG=sha512sum +SOURCE_FORMAT=deb +SOURCE_IN_SUBDIR=false +SOURCE_EXTRACT=false +SOURCE_FILENAME=jellyfin-web.deb diff --git a/manifest.json b/manifest.json index 9120e83..7a8f983 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Jellyfin package for YunoHost.", "fr": "Jellyfin pour YunoHost." }, - "version": "10.5.5", + "version": "10.6.0", "url": "https://github.com/jellyfin/jellyfin", "license": "GPL-2.0", "maintainer": { diff --git a/scripts/install b/scripts/install index 1a277b2..56a164c 100644 --- a/scripts/install +++ b/scripts/install @@ -110,23 +110,29 @@ case $(uname -m) in *) ynh_die "Unknown arch" ;; esac -# Download, check integrity, uncompress and patch the source from jellyfin-[arch].src +# Download, check integrity, uncompress and patch the source from jellyfin-server-[arch].src case $(uname -m) in - x86_64) ynh_setup_source "$final_path" "jellyfin-amd64" ;; - aarch64) ynh_setup_source "$final_path" "jellyfin-arm64" ;; - armv7l) ynh_setup_source "$final_path" "jellyfin-armhf" ;; + x86_64) ynh_setup_source "$final_path" "jellyfin-server-amd64" ;; + aarch64) ynh_setup_source "$final_path" "jellyfin-server-arm64" ;; + armv7l) ynh_setup_source "$final_path" "jellyfin-server-armhf" ;; *) ynh_die "Unknown arch" ;; esac -# Download, check integrity, uncompress and patch the source from jellyfin-plugin-ldapauth.src -#ynh_setup_source "$final_path" "jellyfin-plugin-ldapauth" +# Download, check integrity, uncompress and patch the source from jellyfin-web.src +case $(uname -m) in + x86_64) ynh_setup_source "$final_path" "jellyfin-web" ;; + aarch64) ynh_setup_source "$final_path" "jellyfin-web" ;; + armv7l) ynh_setup_source "$final_path" "jellyfin-web" ;; + *) ynh_die "Unknown arch" ;; +esac #============================================== # INSTALL JELLYFIN #============================================== dpkg --install "$final_path"/jellyfin-ffmpeg.deb -dpkg --install "$final_path"/jellyfin.deb +dpkg --install "$final_path"/jellyfin-server.deb +dpkg --install "$final_path"/jellyfin-web.deb rm "$final_path"/*.deb #================================================= diff --git a/scripts/remove b/scripts/remove index f0c7f89..6a482b9 100644 --- a/scripts/remove +++ b/scripts/remove @@ -48,7 +48,7 @@ ynh_print_info "Removing dependencies" # Remove metapackage and its dependencies ynh_remove_app_dependencies - +apt-get remove -y jellyfin-web jellyfin-server jellyfin-ffmpeg #================================================= # REMOVE APP MAIN DIR #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 7d6665f..939ac14 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -27,11 +27,19 @@ case $(uname -m) in *) ynh_die "Unknown arch" ;; esac -# Download, check integrity, uncompress and patch the source from jellyfin-[arch].src +# Download, check integrity, uncompress and patch the source from jellyfin-server-[arch].src case $(uname -m) in - x86_64) ynh_setup_source "$final_path" "jellyfin-amd64" ;; - aarch64) ynh_setup_source "$final_path" "jellyfin-arm64" ;; - armv7l) ynh_setup_source "$final_path" "jellyfin-armhf" ;; + x86_64) ynh_setup_source "$final_path" "jellyfin-server-amd64" ;; + aarch64) ynh_setup_source "$final_path" "jellyfin-server-arm64" ;; + armv7l) ynh_setup_source "$final_path" "jellyfin-server-armhf" ;; + *) ynh_die "Unknown arch" ;; +esac + +# Download, check integrity, uncompress and patch the source from jellyfin-web.src +case $(uname -m) in + x86_64) ynh_setup_source "$final_path" "jellyfin-web" ;; + aarch64) ynh_setup_source "$final_path" "jellyfin-web" ;; + armv7l) ynh_setup_source "$final_path" "jellyfin-web" ;; *) ynh_die "Unknown arch" ;; esac @@ -39,8 +47,9 @@ esac # INSTALL JELLYFIN #============================================== -dpkg --install "$final_path"/jellyfin-ffmpeg.deb -dpkg --install "$final_path"/jellyfin.deb +apt-get install -y "$final_path"/jellyfin-ffmpeg.deb +apt-get install -y "$final_path"/jellyfin-server.deb +apt-get install -y "$final_path"/jellyfin-web.deb rm "$final_path"/*.deb #================================================= @@ -50,7 +59,6 @@ rm "$final_path"/*.deb # Create a dedicated nginx config #ynh_add_nginx_config - #================================================= # UPGRADE CONFIG #================================================= @@ -59,8 +67,6 @@ rm "$final_path"/*.deb #ynh_replace_string "__PASSWORD__" "$password" "/etc/loolwsd/loolwsd.xml" #systemctl restart loolwsd - - # If app is public, add url to SSOWat conf as skipped_uris #if [[ $is_public -eq 1 ]]; then # See install script