From bb5e42e2c04ccc5899856c252b21dd7591885c59 Mon Sep 17 00:00:00 2001 From: Eilionoir Tunnicliff Date: Fri, 26 Aug 2022 02:57:12 -0400 Subject: [PATCH] Make the Java kit check better + actually fix it --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index ffe622a1..a8b58662 100644 --- a/Makefile +++ b/Makefile @@ -329,20 +329,20 @@ ipa: dsym echo 'Building PojavLauncher $(VERSION) - IPA - Start' mkdir -p $(SOURCEDIR)/depends; \ cd $(SOURCEDIR)/depends; \ - if [ ! -d "java-8-openjdk" ] && [ ! -f "$(ls ../jre8-*.tar.xz)" ]; then \ - mkdir java-8-openjdk && cd java-8-openjdk; \ + if [ ! -f "java-8-openjdk/bin/java" ] && [ ! -f "$(ls ../jre8-*.tar.xz)" ]; then \ if [ "$(RUNNER)" != "1" ]; then \ wget 'https://github.com/PojavLauncherTeam/android-openjdk-build-multiarch/releases/download/jre8-40df388/jre8-arm64-20220811-release.tar.xz'; \ fi; \ + mkdir java-8-openjdk && cd java-8-openjdk; \ tar xvf ../jre8-*.tar.xz; \ rm ../jre8-*.tar.xz; \ fi; \ cd ..; \ - if [ ! -d "java-17-openjdk" ] && [ ! -f "$(ls ../jre17-*.tar.xz)" ]; then \ - mkdir java-17-openjdk && cd java-17-openjdk; \ + if [ ! -f "java-17-openjdk/bin/java" ] && [ ! -f "$(ls ../jre17-*.tar.xz)" ]; then \ if [ "$(RUNNER)" != "1" ]; then \ wget 'https://github.com/PojavLauncherTeam/android-openjdk-build-multiarch/releases/download/jre17-ca01427/jre17-arm64-20220817-release.tar.xz'; \ fi; \ + mkdir java-17-openjdk && cd java-17-openjdk; \ tar xvf ../jre17-*.tar.xz; \ rm ../jre17-*.tar.xz; \ fi; \