sergiotarxz/termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "scripts/properties.sh: allow for jdk in /usr/lib/jvm/java-8-openjdk"

Browse Source 
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 a7e384c1d9.
This commit is contained in:
Henrik Grimler 2022-04-25 22:22:59 +02:00
parent 348c980d53
commit 4798011417
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
scripts/properties.sh
View File

@ -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