| Index: sdk/bin/dartanalyzer_developer
|
| diff --git a/sdk/bin/dartanalyzer_developer b/sdk/bin/dartanalyzer_developer
|
| index b522f56902026a1469a2af28b288a8b808eec2f6..8aff3c1e6d0b5a6fe8fc906c2b6283840d72612c 100755
|
| --- a/sdk/bin/dartanalyzer_developer
|
| +++ b/sdk/bin/dartanalyzer_developer
|
| @@ -9,20 +9,19 @@
|
| set -e
|
|
|
| function follow_links() {
|
| - while [ -h "$1" ]; do
|
| + file="$1"
|
| + while [ -h "$file" ]; do
|
| # On Mac OS, readlink -f doesn't work.
|
| - 1="$(readlink "$1")"
|
| + file="$(readlink "$file")"
|
| done
|
| - echo "$1"
|
| + echo "$(cd "$(dirname $file)"; pwd -P)/$(basename "$file")"
|
| }
|
|
|
| -# Unlike $0, $BASH_SOURCE points to the absolute path of this file.
|
| -PROG_NAME="$(follow_links "$BASH_SOURCE")"
|
| -
|
| -# Handle the case where the binary dir has been symlinked to.
|
| -CUR_DIR="$(follow_links "$(cd "${PROG_NAME%/*}" ; pwd -P)")"
|
| -
|
| -SDK_DIR="$(cd "${CUR_DIR}/.." ; pwd -P)"
|
| +# Unlike $0, $BASH_SOURCE points to the absolute path of this file. Follow
|
| +# symlinks to handle the case where dart-sdk/bin or
|
| +# dart-sdk/bin/dartanalyzer_developer have been linked to.
|
| +CUR_DIR="$(dirname "$(follow_links "$BASH_SOURCE")")"
|
| +SDK_DIR="$(dirname "$CUR_DIR")"
|
|
|
| if [ -z "$DART_CONFIGURATION" ];
|
| then
|
|
|