From 7d46e67a014b4a9aca0f4b7100293de135c559e7 Mon Sep 17 00:00:00 2001 From: Krakinou Date: Sun, 18 Dec 2022 17:38:36 +0100 Subject: [PATCH] Prepare auto-updater --- conf/{app.src.default => app.arm64.src} | 4 ++-- conf/app.armel.src | 5 +++++ conf/app.armhf.src | 5 +++++ conf/app.x86.src | 5 +++++ conf/app.x86_64.src | 5 +++++ scripts/_common.sh | 17 ++--------------- scripts/install | 2 +- 7 files changed, 25 insertions(+), 18 deletions(-) rename conf/{app.src.default => app.arm64.src} (67%) create mode 100644 conf/app.armel.src create mode 100644 conf/app.armhf.src create mode 100644 conf/app.x86.src create mode 100644 conf/app.x86_64.src diff --git a/conf/app.src.default b/conf/app.arm64.src similarity index 67% rename from conf/app.src.default rename to conf/app.arm64.src index 9e41bbb..70f3ed7 100644 --- a/conf/app.src.default +++ b/conf/app.arm64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/UniversalMediaServer/UniversalMediaServer/releases/download/__UPSTREAM_VERSION__/UMS-__UPSTREAM_VERSION__-__MACH__.tgz -SOURCE_SUM=__SHA256__ +SOURCE_URL=https://github.com/UniversalMediaServer/UniversalMediaServer/releases/download/__UPSTREAM_VERSION__/UMS-__UPSTREAM_VERSION__-arm64.tgz +SOURCE_SUM=13b2aa5067c29fcb77956e0804ee96935cf731d1a88d3a24c15dd70964d45c73 SOURCE_FORMAT=tgz SOURCE_SUM_PRG=sha256sum SOURCE_EXTRACT=false diff --git a/conf/app.armel.src b/conf/app.armel.src new file mode 100644 index 0000000..7e2367a --- /dev/null +++ b/conf/app.armel.src @@ -0,0 +1,5 @@ +SOURCE_URL=https://github.com/UniversalMediaServer/UniversalMediaServer/releases/download/__UPSTREAM_VERSION__/UMS-__UPSTREAM_VERSION__-armel.tgz +SOURCE_SUM=f0f9b517fbcedd4b4883ef5de1a6bd96ba1740658220f52037fdb6a4a14d8543 +SOURCE_FORMAT=tgz +SOURCE_SUM_PRG=sha256sum +SOURCE_EXTRACT=false diff --git a/conf/app.armhf.src b/conf/app.armhf.src new file mode 100644 index 0000000..c9136d8 --- /dev/null +++ b/conf/app.armhf.src @@ -0,0 +1,5 @@ +SOURCE_URL=https://github.com/UniversalMediaServer/UniversalMediaServer/releases/download/__UPSTREAM_VERSION__/UMS-__UPSTREAM_VERSION__-armhf.tgz +SOURCE_SUM=864924728649edb50a0b679fd058dcf0e6e4abbcf96a4ceb0c63e48f6b5514ce +SOURCE_FORMAT=tgz +SOURCE_SUM_PRG=sha256sum +SOURCE_EXTRACT=false diff --git a/conf/app.x86.src b/conf/app.x86.src new file mode 100644 index 0000000..d19fdfa --- /dev/null +++ b/conf/app.x86.src @@ -0,0 +1,5 @@ +SOURCE_URL=https://github.com/UniversalMediaServer/UniversalMediaServer/releases/download/__UPSTREAM_VERSION__/UMS-__UPSTREAM_VERSION__-x86_64.tgz +SOURCE_SUM=32cd336096e373bf8b05d2b654bdac688b6daba3e0317be8ae63436820bdb6a4 +SOURCE_FORMAT=tgz +SOURCE_SUM_PRG=sha256sum +SOURCE_EXTRACT=false diff --git a/conf/app.x86_64.src b/conf/app.x86_64.src new file mode 100644 index 0000000..d19fdfa --- /dev/null +++ b/conf/app.x86_64.src @@ -0,0 +1,5 @@ +SOURCE_URL=https://github.com/UniversalMediaServer/UniversalMediaServer/releases/download/__UPSTREAM_VERSION__/UMS-__UPSTREAM_VERSION__-x86_64.tgz +SOURCE_SUM=32cd336096e373bf8b05d2b654bdac688b6daba3e0317be8ae63436820bdb6a4 +SOURCE_FORMAT=tgz +SOURCE_SUM_PRG=sha256sum +SOURCE_EXTRACT=false diff --git a/scripts/_common.sh b/scripts/_common.sh index dc06006..1b69d9d 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -9,33 +9,20 @@ pkg_dependencies="mediainfo dcraw p7zip" mach=`uname -m` -sha256_arm64=13b2aa5067c29fcb77956e0804ee96935cf731d1a88d3a24c15dd70964d45c73 -sha256_armel=f0f9b517fbcedd4b4883ef5de1a6bd96ba1740658220f52037fdb6a4a14d8543 -sha256_armhf=864924728649edb50a0b679fd058dcf0e6e4abbcf96a4ceb0c63e48f6b5514ce -sha256_x86_64=32cd336096e373bf8b05d2b654bdac688b6daba3e0317be8ae63436820bdb6a4 -sha256_x86=18e897527abe618d477036198f963fadac737cf37ad12234cb40ba701afc736d - case "$mach" in "armv6l" ) mach="armel" - sha256=$sha256_armel #for some reason, jre is not in the tarball pkg_dependencies="$pkg_dependencies openjdk-17-jre" ;; "armv7l" ) if [ $(dpkg --print-architecture) = "armhf" ]; then mach="armhf" - sha256=$sha256_armhf else mach="armel" - sha256=$sha256_armel fi pkg_dependencies="$pkg_dependencies openjdk-17-jre";; "armv8l" ) mach="arm64" - sha256=$sha256_arm64 pkg_dependencies="$pkg_dependencies openjdk-17-jre" ;; "aarch64" ) mach="arm64" - sha256=$sha256_arm64 pkg_dependencies="$pkg_dependencies openjdk-17-jre" ;; - "x86_64" ) mach="x86_64" - sha256=$sha256_x86_64 ;; - * ) mach="x86" - sha256=$sha256_x86 ;; + "x86_64" ) mach="x86_64" ;; + * ) mach="x86" ;; esac diff --git a/scripts/install b/scripts/install index c0bafb2..86ba412 100755 --- a/scripts/install +++ b/scripts/install @@ -104,7 +104,7 @@ ynh_script_progression --message="Setting up source files..." --weight=12 # Download, check integrity, uncompress and patch the source from app.src # Create an app.src for the correct compiled version of UMS # match string are fulfilled in _common.sh -ynh_add_config --template="../conf/app.src.default" --destination="../conf/app.src" +ynh_add_config --template="../conf/app.$mach.src" --destination="../conf/app.src" ynh_app_setting_set --app=$app --key=final_path --value=$final_path # Download, check integrity, uncompress and patch the source from app.src