LegacyConsole/jpexs-decompiler
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-05-31 11:44:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix startup script for OpenJDK 8

Browse Source 
Here are the version strings of four major implementations of java:

Sun JDK 7 java version "1.7.0_76"
OpenJDK 7 java version "1.7.0_75"
Sun JDK 8 java version "1.8.0_31"
OpenJDK 8 openjdk version "1.8.0_31"

For OpenJDK 8, the version detector in resources/ffdec.sh fails. An
extra `sed` is necessary for proper execution.
This commit is contained in:
Yen Chi Hsuan
2015-01-30 22:36:13 +08:00
parent f695a4fe59
commit e9f3fb2960
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/ffdec.sh
View File

@@ -52,6 +52,7 @@ cd "`dirname \"$PROGRAM\"`"
# Check default java
if [ -x "`which java`" ]; then
JAVA_VERSION_OUTPUT=`java -version 2>&1`
JAVA_VERSION_OUTPUT=`echo $JAVA_VERSION_OUTPUT | sed 's/openjdk version/java version/'`
check_java_version && exec java -Djava.net.preferIPv4Stack=true -Xmx$MEMORY -jar $JAR_FILE "$@"
fi
@@ -59,6 +60,7 @@ fi
for JRE_PATH in $LOOKUP_JRE_DIRS; do
if [ -x "$JRE_PATH/bin/java" ]; then
JAVA_VERSION_OUTPUT=`"$JRE_PATH/bin/java" -version 2>&1`
JAVA_VERSION_OUTPUT=`echo $JAVA_VERSION_OUTPUT | sed 's/openjdk version/java version/'`
check_java_version && {
export JRE_PATH
exec $JRE_PATH/bin/java -Djava.net.preferIPv4Stack=true -Xmx$MEMORY -jar $JAR_FILE "$@"