From 418baacd125577f627417e98d715596702ae7561 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Mon, 14 Feb 2022 21:10:16 +0100 Subject: [PATCH] Generate buster and bullseye source files --- conf/ffmpeg.bullseye.amd64.src | 7 +++++++ conf/ffmpeg.bullseye.arm64.src | 7 +++++++ conf/ffmpeg.bullseye.armhf.src | 7 +++++++ conf/{ffmpeg.amd64.src => ffmpeg.buster.amd64.src} | 0 conf/{ffmpeg.arm64.src => ffmpeg.buster.arm64.src} | 0 conf/{ffmpeg.armhf.src => ffmpeg.buster.armhf.src} | 0 ...{server.amd64.src => server.bullseye.amd64.src} | 0 ...{server.arm64.src => server.bullseye.arm64.src} | 0 ...{server.armhf.src => server.bullseye.armhf.src} | 0 conf/server.buster.amd64.src | 7 +++++++ conf/server.buster.arm64.src | 7 +++++++ conf/server.buster.armhf.src | 7 +++++++ conf/{web.amd64.src => web.bullseye.amd64.src} | 0 conf/{web.arm64.src => web.bullseye.arm64.src} | 0 conf/{web.armhf.src => web.bullseye.armhf.src} | 0 conf/web.buster.amd64.src | 7 +++++++ conf/web.buster.arm64.src | 7 +++++++ conf/web.buster.armhf.src | 7 +++++++ scripts/install | 14 +++++++------- scripts/restore | 8 ++++---- scripts/update_version.sh | 11 +++++++---- scripts/upgrade | 8 ++++---- 22 files changed, 85 insertions(+), 19 deletions(-) create mode 100644 conf/ffmpeg.bullseye.amd64.src create mode 100644 conf/ffmpeg.bullseye.arm64.src create mode 100644 conf/ffmpeg.bullseye.armhf.src rename conf/{ffmpeg.amd64.src => ffmpeg.buster.amd64.src} (100%) rename conf/{ffmpeg.arm64.src => ffmpeg.buster.arm64.src} (100%) rename conf/{ffmpeg.armhf.src => ffmpeg.buster.armhf.src} (100%) rename conf/{server.amd64.src => server.bullseye.amd64.src} (100%) rename conf/{server.arm64.src => server.bullseye.arm64.src} (100%) rename conf/{server.armhf.src => server.bullseye.armhf.src} (100%) create mode 100644 conf/server.buster.amd64.src create mode 100644 conf/server.buster.arm64.src create mode 100644 conf/server.buster.armhf.src rename conf/{web.amd64.src => web.bullseye.amd64.src} (100%) rename conf/{web.arm64.src => web.bullseye.arm64.src} (100%) rename conf/{web.armhf.src => web.bullseye.armhf.src} (100%) create mode 100644 conf/web.buster.amd64.src create mode 100644 conf/web.buster.arm64.src create mode 100644 conf/web.buster.armhf.src diff --git a/conf/ffmpeg.bullseye.amd64.src b/conf/ffmpeg.bullseye.amd64.src new file mode 100644 index 0000000..985087a --- /dev/null +++ b/conf/ffmpeg.bullseye.amd64.src @@ -0,0 +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_SUM_PRG=sha256sum +SOURCE_FORMAT=deb +SOURCE_IN_SUBDIR=false +SOURCE_EXTRACT=false +SOURCE_FILENAME=jellyfin-ffmpeg.deb diff --git a/conf/ffmpeg.bullseye.arm64.src b/conf/ffmpeg.bullseye.arm64.src new file mode 100644 index 0000000..23b778c --- /dev/null +++ b/conf/ffmpeg.bullseye.arm64.src @@ -0,0 +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_SUM_PRG=sha256sum +SOURCE_FORMAT=deb +SOURCE_IN_SUBDIR=false +SOURCE_EXTRACT=false +SOURCE_FILENAME=jellyfin-ffmpeg.deb diff --git a/conf/ffmpeg.bullseye.armhf.src b/conf/ffmpeg.bullseye.armhf.src new file mode 100644 index 0000000..1f758b0 --- /dev/null +++ b/conf/ffmpeg.bullseye.armhf.src @@ -0,0 +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_SUM_PRG=sha256sum +SOURCE_FORMAT=deb +SOURCE_IN_SUBDIR=false +SOURCE_EXTRACT=false +SOURCE_FILENAME=jellyfin-ffmpeg.deb diff --git a/conf/ffmpeg.amd64.src b/conf/ffmpeg.buster.amd64.src similarity index 100% rename from conf/ffmpeg.amd64.src rename to conf/ffmpeg.buster.amd64.src diff --git a/conf/ffmpeg.arm64.src b/conf/ffmpeg.buster.arm64.src similarity index 100% rename from conf/ffmpeg.arm64.src rename to conf/ffmpeg.buster.arm64.src diff --git a/conf/ffmpeg.armhf.src b/conf/ffmpeg.buster.armhf.src similarity index 100% rename from conf/ffmpeg.armhf.src rename to conf/ffmpeg.buster.armhf.src diff --git a/conf/server.amd64.src b/conf/server.bullseye.amd64.src similarity index 100% rename from conf/server.amd64.src rename to conf/server.bullseye.amd64.src diff --git a/conf/server.arm64.src b/conf/server.bullseye.arm64.src similarity index 100% rename from conf/server.arm64.src rename to conf/server.bullseye.arm64.src diff --git a/conf/server.armhf.src b/conf/server.bullseye.armhf.src similarity index 100% rename from conf/server.armhf.src rename to conf/server.bullseye.armhf.src diff --git a/conf/server.buster.amd64.src b/conf/server.buster.amd64.src new file mode 100644 index 0000000..bbf422f --- /dev/null +++ b/conf/server.buster.amd64.src @@ -0,0 +1,7 @@ +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_SUM_PRG=sha256sum +SOURCE_FORMAT=deb +SOURCE_IN_SUBDIR=false +SOURCE_EXTRACT=false +SOURCE_FILENAME=jellyfin-server.deb diff --git a/conf/server.buster.arm64.src b/conf/server.buster.arm64.src new file mode 100644 index 0000000..46a191e --- /dev/null +++ b/conf/server.buster.arm64.src @@ -0,0 +1,7 @@ +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_SUM_PRG=sha256sum +SOURCE_FORMAT=deb +SOURCE_IN_SUBDIR=false +SOURCE_EXTRACT=false +SOURCE_FILENAME=jellyfin-server.deb diff --git a/conf/server.buster.armhf.src b/conf/server.buster.armhf.src new file mode 100644 index 0000000..1968dd0 --- /dev/null +++ b/conf/server.buster.armhf.src @@ -0,0 +1,7 @@ +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_SUM_PRG=sha256sum +SOURCE_FORMAT=deb +SOURCE_IN_SUBDIR=false +SOURCE_EXTRACT=false +SOURCE_FILENAME=jellyfin-server.deb diff --git a/conf/web.amd64.src b/conf/web.bullseye.amd64.src similarity index 100% rename from conf/web.amd64.src rename to conf/web.bullseye.amd64.src diff --git a/conf/web.arm64.src b/conf/web.bullseye.arm64.src similarity index 100% rename from conf/web.arm64.src rename to conf/web.bullseye.arm64.src diff --git a/conf/web.armhf.src b/conf/web.bullseye.armhf.src similarity index 100% rename from conf/web.armhf.src rename to conf/web.bullseye.armhf.src diff --git a/conf/web.buster.amd64.src b/conf/web.buster.amd64.src new file mode 100644 index 0000000..25cac6c --- /dev/null +++ b/conf/web.buster.amd64.src @@ -0,0 +1,7 @@ +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_SUM_PRG=sha256sum +SOURCE_FORMAT=deb +SOURCE_IN_SUBDIR=false +SOURCE_EXTRACT=false +SOURCE_FILENAME=jellyfin-web.deb diff --git a/conf/web.buster.arm64.src b/conf/web.buster.arm64.src new file mode 100644 index 0000000..25cac6c --- /dev/null +++ b/conf/web.buster.arm64.src @@ -0,0 +1,7 @@ +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_SUM_PRG=sha256sum +SOURCE_FORMAT=deb +SOURCE_IN_SUBDIR=false +SOURCE_EXTRACT=false +SOURCE_FILENAME=jellyfin-web.deb diff --git a/conf/web.buster.armhf.src b/conf/web.buster.armhf.src new file mode 100644 index 0000000..25cac6c --- /dev/null +++ b/conf/web.buster.armhf.src @@ -0,0 +1,7 @@ +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_SUM_PRG=sha256sum +SOURCE_FORMAT=deb +SOURCE_IN_SUBDIR=false +SOURCE_EXTRACT=false +SOURCE_FILENAME=jellyfin-web.deb diff --git a/scripts/install b/scripts/install index d0e2cce..2f10c97 100644 --- a/scripts/install +++ b/scripts/install @@ -114,20 +114,20 @@ ynh_script_progression --message="Installing packages..." --weight=1 tempdir="$(mktemp -d)" # Download the deb files -ynh_setup_source --dest_dir=$tempdir --source_id="ffmpeg.$architecture" +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.$architecture.src" | cut -d= -f2-) +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.$architecture.src" + 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.$architecture" +ynh_setup_source --dest_dir=$tempdir --source_id="server.$debian.$architecture" # Same for web -src_url=$(grep 'SOURCE_URL=' "../conf/web.$architecture.src" | cut -d= -f2-) +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.$architecture.src" + 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.$architecture" +ynh_setup_source --dest_dir=$tempdir --source_id="web.$debian.$architecture" # Install the packages ynh_exec_warn_less dpkg -i $tempdir/jellyfin-ffmpeg.deb diff --git a/scripts/restore b/scripts/restore index 2d796bb..e1dfdd3 100644 --- a/scripts/restore +++ b/scripts/restore @@ -125,16 +125,16 @@ tempdir="$(mktemp -d)" # Download the deb files ynh_setup_source --dest_dir=$tempdir --source_id="ffmpeg.$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.$architecture.src" | cut -d= -f2-) +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.$architecture.src" + 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.$architecture" # Same for web -src_url=$(grep 'SOURCE_URL=' "../settings/conf/web.$architecture.src" | cut -d= -f2-) +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.$architecture.src" + 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.$architecture" diff --git a/scripts/update_version.sh b/scripts/update_version.sh index cc07c74..8b56568 100755 --- a/scripts/update_version.sh +++ b/scripts/update_version.sh @@ -69,11 +69,14 @@ prepare_source () { fi } +debians=("buster" "bullseye") architectures=("amd64" "arm64" "armhf") -for architecture in "${architectures[@]}"; do - prepare_source --template="../conf/ffmpeg.src.default" --destination="../conf/ffmpeg.$architecture.src" --architecture="$architecture" - prepare_source --template="../conf/web.src.default" --destination="../conf/web.$architecture.src" --architecture="$architecture" - prepare_source --template="../conf/server.src.default" --destination="../conf/server.$architecture.src" --architecture="$architecture" +for debian in "${debians[@]}"; do + for architecture in "${architectures[@]}"; do + prepare_source --template="../conf/ffmpeg.src.default" --destination="../conf/ffmpeg.$debian.$architecture.src" --architecture="$architecture" + prepare_source --template="../conf/web.src.default" --destination="../conf/web.$debian.$architecture.src" --architecture="$architecture" + prepare_source --template="../conf/server.src.default" --destination="../conf/server.$debian.$architecture.src" --architecture="$architecture" + done done prepare_source --template="../conf/ldap.src.default" --destination="../conf/ldap.src" diff --git a/scripts/upgrade b/scripts/upgrade index 0bbfc4e..490c563 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -152,16 +152,16 @@ tempdir="$(mktemp -d)" # Download the deb files ynh_setup_source --dest_dir=$tempdir --source_id="ffmpeg.$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.$architecture.src" | cut -d= -f2-) +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.$architecture.src" + 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.$architecture" # Same for web -src_url=$(grep 'SOURCE_URL=' "../conf/web.$architecture.src" | cut -d= -f2-) +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.$architecture.src" + 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.$architecture"