39 lines
1.5 KiB
Diff
39 lines
1.5 KiB
Diff
|
*** jks-keystore.dst 2016-03-30 01:41:20.000000000 +0300
|
||
|
|
--- jks-keystore 2019-10-25 05:12:39.275249418 +0300
|
||
|
|
***************
|
||
|
|
*** 33,48 ****
|
||
|
|
if ! mountpoint -q /proc; then
|
||
|
|
echo >&2 "the keytool command requires a mounted proc fs (/proc)."
|
||
|
|
exit 1
|
||
|
|
fi
|
||
|
|
|
||
|
|
! for jvm in java-7-openjdk-$arch java-7-openjdk \
|
||
|
|
! oracle-java7-jre-$arch oracle-java7-server-jre-$arch oracle-java7-jdk-$arch \
|
||
|
|
! java-8-openjdk-$arch java-8-openjdk \
|
||
|
|
oracle-java8-jre-$arch oracle-java8-server-jre-$arch oracle-java8-jdk-$arch \
|
||
|
|
java-9-openjdk-$arch java-9-openjdk \
|
||
|
|
! oracle-java9-jre-$arch oracle-java9-server-jre-$arch oracle-java9-jdk-$arch; do
|
||
|
|
if [ -x /usr/lib/jvm/$jvm/bin/java ]; then
|
||
|
|
break
|
||
|
|
fi
|
||
|
|
done
|
||
|
|
export JAVA_HOME=/usr/lib/jvm/$jvm
|
||
|
|
--- 33,49 ----
|
||
|
|
if ! mountpoint -q /proc; then
|
||
|
|
echo >&2 "the keytool command requires a mounted proc fs (/proc)."
|
||
|
|
exit 1
|
||
|
|
fi
|
||
|
|
|
||
|
|
! for jvm in java-8-openjdk-$arch java-8-openjdk \
|
||
|
|
oracle-java8-jre-$arch oracle-java8-server-jre-$arch oracle-java8-jdk-$arch \
|
||
|
|
java-9-openjdk-$arch java-9-openjdk \
|
||
|
|
! oracle-java9-jre-$arch oracle-java9-server-jre-$arch oracle-java9-jdk-$arch \
|
||
|
|
! java-7-openjdk-$arch java-7-openjdk \
|
||
|
|
! oracle-java7-jre-$arch oracle-java7-server-jre-$arch oracle-java7-jdk-$arch \
|
||
|
|
! ; do
|
||
|
|
if [ -x /usr/lib/jvm/$jvm/bin/java ]; then
|
||
|
|
break
|
||
|
|
fi
|
||
|
|
done
|
||
|
|
export JAVA_HOME=/usr/lib/jvm/$jvm
|