From eedbf0ccfc2bf055a6460cc4565f3e0da3faa057 Mon Sep 17 00:00:00 2001 From: "ricow@google.com" Date: Thu, 8 Aug 2013 11:31:54 +0000 Subject: [PATCH] Fix a few issues in the dartanalyzer shell scripts. R=scheglov@google.com Review URL: https://codereview.chromium.org//22577003 git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge/dart@25923 260f80e4-7a28-3924-810f-c04153c831b5 --- sdk/bin/dartanalyzer | 4 ++-- sdk/bin/dartanalyzer_developer | 18 +++++++++++++++--- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/sdk/bin/dartanalyzer b/sdk/bin/dartanalyzer index cc33e5c549c..4ea86af0e6b 100755 --- a/sdk/bin/dartanalyzer +++ b/sdk/bin/dartanalyzer @@ -28,7 +28,7 @@ do done DART_SDK="" -if [ $FOUND_SDK = 0 ] ; then +if [ $FOUND_SDK -eq 0 ] ; then if [ -f "$DART_ANALYZER_HOME/lib/core/core.dart" ] ; then DART_SDK=(--dart-sdk "$DART_ANALYZER_HOME") else @@ -70,7 +70,7 @@ else # On other architectures # -batch invocations will do better with a server vm # invocations for analyzing a single file do better with a client vm - if [ $FOUND_BATCH = 0 ] ; then + if [ $FOUND_BATCH -eq 0 ] ; then EXTRA_JVMARGS+=" -client " fi fi diff --git a/sdk/bin/dartanalyzer_developer b/sdk/bin/dartanalyzer_developer index 9cf163d7e63..1e95873d138 100755 --- a/sdk/bin/dartanalyzer_developer +++ b/sdk/bin/dartanalyzer_developer @@ -16,6 +16,18 @@ function follow_links() { echo "$1" } +FOUND_BATCH=0 +for ARG in "$@" +do + case $ARG in + -batch|--batch) + FOUND_BATCH=1 + ;; + *) + ;; + esac +done + # Unlike $0, $BASH_SOURCE points to the absolute path of this file. PROG_NAME="$(follow_links "$BASH_SOURCE")" @@ -29,12 +41,12 @@ then DART_CONFIGURATION="ReleaseIA32" fi -if [[ `uname` == 'Darwin' ]]; +if [ `uname` == 'Darwin' ]; then JAR_DIR="$CUR_DIR"/../../xcodebuild/$DART_CONFIGURATION/dartanalyzer else JAR_DIR="$CUR_DIR"/../../out/$DART_CONFIGURATION/dartanalyzer -fi +fi JAR_FILE="$JAR_DIR/dartanalyzer.jar" @@ -47,7 +59,7 @@ else # On other architectures # -batch invocations will do better with a server vm # invocations for analyzing a single file do better with a client vm - if [ $FOUND_BATCH = 0 ] ; then + if [ $FOUND_BATCH -eq 0 ] ; then EXTRA_JVMARGS+=" -client " fi fi