From 82210f54cc8ff8a62e46710b37be8b4708960c71 Mon Sep 17 00:00:00 2001 From: Alexey Ushakov Date: Tue, 14 Feb 2017 02:53:25 +0300 Subject: [PATCH] IDEA-167914 CLion IDE fails to start on FreeBSD Added check for Linux to avoid hanging on FreeBSD on java -version --- bin/scripts/unix/idea.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/scripts/unix/idea.sh b/bin/scripts/unix/idea.sh index e0601c105681..0e840e5649df 100755 --- a/bin/scripts/unix/idea.sh +++ b/bin/scripts/unix/idea.sh @@ -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"