Chromium Code Reviews| Index: sdk/bin/dart2js |
| diff --git a/sdk/bin/dart2js b/sdk/bin/dart2js |
| index 79a857be83efe500109c4f7c760fa2a9c008f2f9..3446445bf39367e548428958efcee73074a80ea4 100755 |
| --- a/sdk/bin/dart2js |
| +++ b/sdk/bin/dart2js |
| @@ -3,17 +3,15 @@ |
| # for details. All rights reserved. Use of this source code is governed by a |
| # BSD-style license that can be found in the LICENSE file. |
| -function follow_links() { |
| - file="$1" |
| - while [ -h "$file" ]; do |
| - # On Mac OS, readlink -f doesn't work. |
| - file="$(readlink "$file")" |
|
ahe
2013/12/06 08:06:30
The problem is this line. On Mac, this reads the l
|
| - done |
| - echo "$file" |
| -} |
| +PROG_NAME=$(cd -P -- "$(dirname -- "$0")" && pwd -P) && \ |
| + PROG_NAME=$PROG_NAME/$(basename -- "$0") |
| -# Unlike $0, $BASH_SOURCE points to the absolute path of this file. |
| -PROG_NAME="$(follow_links "$BASH_SOURCE")" |
| +# resolve symlinks |
| +while [ -h $PROG_NAME ]; do |
| + DIR=$(dirname -- "$PROG_NAME") |
| + SYM=$(readlink $PROG_NAME) |
| + PROG_NAME=$(cd $DIR && cd $(dirname -- "$SYM") && pwd)/$(basename -- "$SYM") |
| +done |
| # Handle the case where dart-sdk/bin has been symlinked to. |
| BIN_DIR="$(cd "${PROG_NAME%/*}" ; pwd -P)" |