IDEA-167914 CLion IDE fails to start on FreeBSD

Added check for Linux to avoid hanging on FreeBSD on java -version
This commit is contained in:
Alexey Ushakov
2017-02-14 02:55:35 +03:00
parent ad4727a76b
commit 82210f54cc
+1 -1
View File
@@ -68,7 +68,7 @@ elif [ -s "$HOME/.@@system_selector@@/config/@@vm_options@@.jdk" ]; then
if [ ! -d "$JDK" ]; then
JDK="$IDE_HOME/$JDK"
fi
elif [ -x "$IDE_HOME/jre/jre/bin/java" ] && "$IDE_HOME/jre/jre/bin/java" -version > /dev/null 2>&1 ; then
elif [ "$OS_TYPE" = "Linux" ] && [ -x "$IDE_HOME/jre/jre/bin/java" ] && "$IDE_HOME/jre/jre/bin/java" -version > /dev/null 2>&1 ; then
JDK="$IDE_HOME/jre"
elif [ -n "$JDK_HOME" -a -x "$JDK_HOME/bin/java" ]; then
JDK="$JDK_HOME"