From 470c48ef1c87f00c5aa4903db97bb8e502d142e6 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Wed, 30 May 2012 21:24:49 +0400 Subject: [PATCH] IDEA-86765 (plain grep compatibility) --- bin/scripts/unix/idea.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/scripts/unix/idea.sh b/bin/scripts/unix/idea.sh index e6b6d7e3d2c8..25606d590da7 100755 --- a/bin/scripts/unix/idea.sh +++ b/bin/scripts/unix/idea.sh @@ -6,7 +6,7 @@ # UNAME=`which uname` -GREP=`which grep` +GREP=`which egrep` GREP_OPTIONS="" CUT=`which cut` READLINK=`which readlink` @@ -80,7 +80,7 @@ VERSION_LOG=`"$MKTEMP" -t java.version.log.XXXXXX` "$JDK/bin/java" -version 2> "$VERSION_LOG" "$GREP" 'OpenJDK' "$VERSION_LOG" OPEN_JDK=$? -"$GREP" "64-Bit\|x86_64" "$VERSION_LOG" +"$GREP" "64-Bit|x86_64" "$VERSION_LOG" BITS=$? "$RM" -f "$VERSION_LOG" if [ $OPEN_JDK -eq 0 ]; then @@ -136,7 +136,7 @@ if [ -z "$VM_OPTIONS_FILE" ]; then fi if [ -r "$VM_OPTIONS_FILE" ]; then - VM_OPTIONS=`"$CAT" "$VM_OPTIONS_FILE" | "$GREP" -ve "^#.*" | "$TR" '\n' ' '` + VM_OPTIONS=`"$CAT" "$VM_OPTIONS_FILE" | "$GREP" -v "^#.*" | "$TR" '\n' ' '` VM_OPTIONS="$VM_OPTIONS -Djb.vmOptionsFile=\"$VM_OPTIONS_FILE\"" fi