From 60e0179039a500593ba77fc9aee23cc0c4d2226e Mon Sep 17 00:00:00 2001 From: Google61 Date: Fri, 9 Apr 2021 14:42:32 +0300 Subject: [PATCH 1/3] Fix termux-elf-cleaner --- tarjdk.sh | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/tarjdk.sh b/tarjdk.sh index 54be035..fa26c3e 100755 --- a/tarjdk.sh +++ b/tarjdk.sh @@ -2,7 +2,7 @@ set -e # cleanup ELF stuff -unset AR AS CC CXX LD OBJCOPY RANLIB STRIP +unset AR AS CC CXX LD OBJCOPY RANLIB STRIP CPPFLAGS LDFLAGS git clone https://github.com/termux/termux-elf-cleaner cd termux-elf-cleaner make CFLAGS=__ANDROID_API__=24 termux-elf-cleaner @@ -11,8 +11,17 @@ cd .. mv jre_override/lib/* jreout/lib/ -find jreout -name "*.so" | xargs -- ./termux-elf-cleaner/termux-elf-cleaner -find jdkout -name "*.so" | xargs -- ./termux-elf-cleaner/termux-elf-cleaner +findexec() { find $1 -type f -name "*" -not -name "*.o" -exec sh -c ' + case "$(head -n 1 "$1")" in + ?ELF*) exit 0;; + MZ*) exit 0;; + #!*/ocamlrun*)exit0;; + esac +exit 1 +' sh {} \; -print } + +findexec jreout | xargs -- ./termux-elf-cleaner/termux-elf-cleaner +findexec jdkout | xargs -- ./termux-elf-cleaner/termux-elf-cleaner cd jreout tar cJf ../jre8-${TARGET_SHORT}-`date +%Y%m%d`-${JDK_DEBUG_LEVEL}.tar.xz . From 5d35791652e7f81910fdc706ee21df32c8c0828c Mon Sep 17 00:00:00 2001 From: Google61 Date: Fri, 9 Apr 2021 14:43:34 +0300 Subject: [PATCH 2/3] Trigger ci --- tarjdk.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/tarjdk.sh b/tarjdk.sh index fa26c3e..4890a51 100755 --- a/tarjdk.sh +++ b/tarjdk.sh @@ -1,7 +1,6 @@ #!/bin/bash set -e -# cleanup ELF stuff unset AR AS CC CXX LD OBJCOPY RANLIB STRIP CPPFLAGS LDFLAGS git clone https://github.com/termux/termux-elf-cleaner cd termux-elf-cleaner From 9679450a6bf000199d6f5a0159e97396ac84b0a0 Mon Sep 17 00:00:00 2001 From: Google61 Date: Fri, 9 Apr 2021 19:30:20 +0300 Subject: [PATCH 3/3] The damn parenthese --- tarjdk.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tarjdk.sh b/tarjdk.sh index 4890a51..8124d6b 100755 --- a/tarjdk.sh +++ b/tarjdk.sh @@ -17,7 +17,8 @@ findexec() { find $1 -type f -name "*" -not -name "*.o" -exec sh -c ' #!*/ocamlrun*)exit0;; esac exit 1 -' sh {} \; -print } +' sh {} \; -print +} findexec jreout | xargs -- ./termux-elf-cleaner/termux-elf-cleaner findexec jdkout | xargs -- ./termux-elf-cleaner/termux-elf-cleaner