mirror of
https://github.com/dart-lang/sdk
synced 2024-10-14 15:21:54 +00:00
Fix dartanalyzer failure to run when there are spaces in the path to the dart-sdk.
BUG=dartbug.com/7593 R=devoncarew@google.com Review URL: https://codereview.chromium.org//16068003 git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge/dart@23198 260f80e4-7a28-3924-810f-c04153c831b5
This commit is contained in:
parent
79030deff3
commit
b203ff2f8a
|
@ -29,16 +29,16 @@ done
|
|||
|
||||
DART_SDK=""
|
||||
if [ $FOUND_SDK = 0 ] ; then
|
||||
if [ -f $DART_ANALYZER_HOME/lib/core/core.dart ] ; then
|
||||
DART_SDK="--dart-sdk $DART_ANALYZER_HOME"
|
||||
if [ -f "$DART_ANALYZER_HOME/lib/core/core.dart" ] ; then
|
||||
DART_SDK=(--dart-sdk "$DART_ANALYZER_HOME")
|
||||
else
|
||||
DART_SDK_HOME=$(dirname $DART_ANALYZER_HOME)/dart-sdk
|
||||
if [ -d $DART_SDK_HOME ] ; then
|
||||
DART_SDK="--dart-sdk $DART_SDK_HOME"
|
||||
DART_SDK_HOME=$(dirname "$DART_ANALYZER_HOME")/dart-sdk
|
||||
if [ -d "$DART_SDK_HOME" ] ; then
|
||||
DART_SDK=(--dart-sdk "$DART_SDK_HOME")
|
||||
else
|
||||
DART_SDK_HOME=$(dirname $DART_SDK_HOME)/dart-sdk
|
||||
if [ -d $DART_SDK_HOME ] ; then
|
||||
DART_SDK="--dart-sdk $DART_SDK_HOME"
|
||||
DART_SDK_HOME=$(dirname "$DART_SDK_HOME")/dart-sdk
|
||||
if [ -d "$DART_SDK_HOME" ] ; then
|
||||
DART_SDK=(--dart-sdk "$DART_SDK_HOME")
|
||||
else
|
||||
echo "Couldn't find Dart SDK. Specify with --dart-sdk cmdline argument"
|
||||
fi
|
||||
|
@ -46,9 +46,9 @@ if [ $FOUND_SDK = 0 ] ; then
|
|||
fi
|
||||
fi
|
||||
|
||||
if [ -f $DART_SDK_HOME/util/dartanalyzer/dartanalyzer.jar ] ; then
|
||||
if [ -f "$DART_SDK_HOME/util/dartanalyzer/dartanalyzer.jar" ] ; then
|
||||
DART_ANALYZER_LIBS=$DART_SDK_HOME/util/dartanalyzer
|
||||
elif [ -f $DART_ANALYZER_HOME/util/dartanalyzer/dartanalyzer.jar ] ; then
|
||||
elif [ -f "$DART_ANALYZER_HOME/util/dartanalyzer/dartanalyzer.jar" ] ; then
|
||||
DART_ANALYZER_LIBS=$DART_ANALYZER_HOME/util/dartanalyzer
|
||||
else
|
||||
echo "Configuration problem. Couldn't find dartanalyzer.jar."
|
||||
|
@ -76,4 +76,4 @@ else
|
|||
fi
|
||||
|
||||
exec java $EXTRA_JVMARGS $DART_JVMARGS -ea -jar \
|
||||
"$DART_ANALYZER_LIBS/dartanalyzer.jar" ${DART_SDK} $@
|
||||
"$DART_ANALYZER_LIBS/dartanalyzer.jar" "${DART_SDK[@]}" $@
|
||||
|
|
Loading…
Reference in a new issue