From af1efc24ce936ef037e0774d50b8d8b4887aad05 Mon Sep 17 00:00:00 2001 From: Guillaume Gautier Date: Thu, 7 Nov 2019 23:50:52 +0100 Subject: [PATCH] Upgrade to 10.4.1 --- conf/jellyfin-amd64.src | 4 ++-- conf/jellyfin-arm64.src | 4 ++-- manifest.json | 2 +- scripts/install | 26 +++++++++++--------------- scripts/upgrade | 33 +++++++++++++++++++++++++-------- 5 files changed, 41 insertions(+), 28 deletions(-) diff --git a/conf/jellyfin-amd64.src b/conf/jellyfin-amd64.src index 9547df5..f185733 100644 --- a/conf/jellyfin-amd64.src +++ b/conf/jellyfin-amd64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/jellyfin/jellyfin/releases/download/v10.4.0/jellyfin_10.4.0-1_debian-amd64.deb -SOURCE_SUM=3088e1e9c2f502ca003c04a84474dc3a25f9ded7fb8faa5e6d51f1322e118a590c946315d76c8f0c592d030725fcf2f9cab2b1d4e1de83472407ba24fcbdf6ee +SOURCE_URL=https://github.com/jellyfin/jellyfin/releases/download/v10.4.1/jellyfin_10.4.1-1_debian-amd64.deb +SOURCE_SUM=11cf6fa418d9a060c89390361f0eb5628a277029457e99ddd39f30d6fa1e69d484a9a321e8000aec8c70d8327460999343065e1993782cb44b1ac3b4cede353d SOURCE_SUM_PRG=sha512sum SOURCE_FORMAT=deb SOURCE_IN_SUBDIR=false diff --git a/conf/jellyfin-arm64.src b/conf/jellyfin-arm64.src index 53c851b..dc055e9 100644 --- a/conf/jellyfin-arm64.src +++ b/conf/jellyfin-arm64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/jellyfin/jellyfin/releases/download/v10.4.0/jellyfin_10.4.0-1_debian-arm64.deb -SOURCE_SUM=7e0720719aa36febdc617fe01db4a5b834e771416b7325e6b935745520b537c18c7827868ed9381acc33c62d980704c2952804959cfa086400a7995ce4e08a4d +SOURCE_URL=https://github.com/jellyfin/jellyfin/releases/download/v10.4.1/jellyfin_10.4.1-1_debian-arm64.deb +SOURCE_SUM=d9b35e384ebe3ebce3e587298c07cd83f29f4ba70434838c6fa03caee96a63d6d60ba94755ebd5e3686878b9c5b1f5f4b2f0108003b701e7ee56c809f892892a SOURCE_SUM_PRG=sha512sum SOURCE_FORMAT=deb SOURCE_IN_SUBDIR=false diff --git a/manifest.json b/manifest.json index 61168ac..08f1296 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Jellyfin package for YunoHost.", "fr": "Jellyfin pour YunoHost." }, - "version": "10.4.0", + "version": "10.4.1", "url": "https://github.com/jellyfin/jellyfin", "license": "GPL-2.0", "maintainer": { diff --git a/scripts/install b/scripts/install index be4ab79..72b83f1 100644 --- a/scripts/install +++ b/scripts/install @@ -102,23 +102,22 @@ ynh_app_setting_set $app port $port #================================================= ynh_app_setting_set $app final_path $final_path -# Download, check integrity, uncompress and patch the source from app.src +# Download, check integrity, uncompress and patch the source from jellyfin-ffmpeg-[arch].src case `uname -m` in x86_64) ynh_setup_source "$final_path" "jellyfin-ffmpeg-amd64" ;; aarch64) ynh_setup_source "$final_path" "jellyfin-ffmpeg-arm64" ;; *) ynh_die "Unknown arch" ;; esac -ynh_app_setting_set $app final_path $final_path -# Download, check integrity, uncompress and patch the source from app.src - +# Download, check integrity, uncompress and patch the source from jellyfin-[arch].src case `uname -m` in x86_64) ynh_setup_source "$final_path" "jellyfin-amd64" ;; aarch64) ynh_setup_source "$final_path" "jellyfin-arm64" ;; *) 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" #============================================== @@ -134,19 +133,12 @@ rm $final_path/*.deb #============================================== plugins_path=/var/lib/jellyfin/plugins -plugins_conf_path=$plugins_path/configurations -plugins_conf_file=$plugins_conf_path/LDAP-Auth.xml ldap_plugin_path="$plugins_path/LDAP Authentication" mkdir -p "$ldap_plugin_path" unzip $final_path/jellyfin-plugin-ldapauth.zip -d "$ldap_plugin_path" rm $final_path/*.zip -mkdir -p "$plugins_conf_path" -cp ../conf/LDAP-Auth.xml "$plugins_conf_file" -ynh_replace_string --match_string="__BINDPASSWORD__" --replace_string="$password" --target_file="$plugins_conf_file" -chown -R jellyfin:jellyfin "$plugins_path" - #================================================= # NGINX CONFIGURATION #================================================= @@ -164,9 +156,13 @@ ynh_system_user_create $app #================================================= # MODIFY A CONFIG FILE #================================================= -#cp -a ../conf/onlyoffice-documentserver.conf /etc/onlyoffice/documentserver/nginx/onlyoffice-documentserver.conf -#ynh_replace_string "__NEXTCLOUDDOMAIN__" "$nextcloud_domain" "/etc/loolwsd/loolwsd.xml" -#ynh_replace_string "__PASSWORD__" "$password" "/etc/loolwsd/loolwsd.xml" +plugins_conf_path=$plugins_path/configurations +plugins_conf_file=$plugins_conf_path/LDAP-Auth.xml + +mkdir -p "$plugins_conf_path" +cp ../conf/LDAP-Auth.xml "$plugins_conf_file" +ynh_replace_string --match_string="__BINDPASSWORD__" --replace_string="$password" --target_file="$plugins_conf_file" +chown -R jellyfin:jellyfin "$plugins_path" #================================================= # STORE THE CONFIG FILE CHECKSUM @@ -177,7 +173,7 @@ ynh_system_user_create $app ### you can make a backup of this file before modifying it again if the admin had modified it. # Calculate and store the config file checksum into the app settings -#ynh_store_file_checksum "/etc/onlyoffice/documentserver/nginx/onlyoffice-documentserver.conf" +ynh_store_file_checksum "$plugins_conf_file" #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 3ad3f7a..6265efe 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -10,22 +10,39 @@ final_path=/opt/yunohost/$app # Source YunoHost helpers source /usr/share/yunohost/helpers -# Stop emby-server service -systemctl stop emby-server +# Stop jellyfin service +systemctl stop jellyfin #================================================= # 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" + +# Download, check integrity, uncompress and patch the source from jellyfin-ffmpeg-[arch].src +case `uname -m` in + x86_64) ynh_setup_source "$final_path" "jellyfin-ffmpeg-amd64" ;; + aarch64) ynh_setup_source "$final_path" "jellyfin-ffmpeg-arm64" ;; + *) ynh_die "Unknown arch" ;; +esac + +# Download, check integrity, uncompress and patch the source from jellyfin-[arch].src +case `uname -m` in + x86_64) ynh_setup_source "$final_path" "jellyfin-amd64" ;; + aarch64) ynh_setup_source "$final_path" "jellyfin-arm64" ;; + *) 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" #============================================== -# INSTALL PLEX +# INSTALL JELLYFIN #============================================== -dpkg --install $final_path/emby-server-deb* +dpkg --install $final_path/jellyfin-ffmpeg.deb +dpkg --install $final_path/jellyfin.deb +rm $final_path/*.deb #================================================= # NGINX CONFIGURATION @@ -51,6 +68,6 @@ dpkg --install $final_path/emby-server-deb* # ynh_app_setting_set "$app" unprotected_uris "/" #fi -# Start emby-server service -systemctl start emby-server +# Start jellyfin service +systemctl start jellyfin