From 4798011417c7bdddd54ca8f69f16edec4fb355c7 Mon Sep 17 00:00:00 2001
From: Henrik Grimler <grimler@termux.org>
Date: Mon, 25 Apr 2022 22:22:59 +0200
Subject: [PATCH] Revert "scripts/properties.sh: allow for jdk in
 /usr/lib/jvm/java-8-openjdk"

openjdk might not be available in the various places properties.sh is
sourced, as when linting the packages:
https://github.com/termux/termux-packages/pull/10331.  Revert the
commit to fix this issue.

This reverts commit a7e384c1d9819435a80ad908626abd35fb2fb4ce.
---
 scripts/properties.sh | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/scripts/properties.sh b/scripts/properties.sh
index 0761f08cb..b04778f38 100644
--- a/scripts/properties.sh
+++ b/scripts/properties.sh
@@ -11,14 +11,7 @@ TERMUX_NDK_VERSION=$TERMUX_NDK_VERSION_NUM$TERMUX_NDK_REVISION
 # update SHA256 sums in scripts/setup-android-sdk.sh
 # check all packages build and run correctly and bump if needed
 
-if [ -d "/usr/lib/jvm/java-8-openjdk-amd64" ]; then
-	export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
-elif [ -d "/usr/lib/jvm/java-8-openjdk" ]; then
-	export JAVA_HOME=/usr/lib/jvm/java-8-openjdk
-else
-	echo "Error: /usr/lib/jvm/java-8-openjdk{,-amd64} not found. Is openjdk 8 installed?"
-	exit 1
-fi
+export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
 
 if [ "${TERMUX_PACKAGES_OFFLINE-false}" = "true" ]; then
 	export ANDROID_HOME=${TERMUX_SCRIPTDIR}/build-tools/android-sdk-$TERMUX_SDK_REVISION