Index: sdk/bin/dartdoc |
diff --git a/sdk/bin/dartdoc b/sdk/bin/dartdoc |
index 3f223678f655240fa886e78badda0250211bdfb8..e5f8ea3d18edf581a120ac14ccba9e9d25ec7a88 100755 |
--- a/sdk/bin/dartdoc |
+++ b/sdk/bin/dartdoc |
@@ -4,9 +4,15 @@ |
# BSD-style license that can be found in the LICENSE file. |
# Setting BIN_DIR this way is ugly, but is needed to handle the case where |
-# dart-sdk/bin has been symlinked to. On MacOS, readlink doesn't work |
-# with this case. |
-BIN_DIR="$(cd "${0%/*}" ; pwd -P)" |
+# dart-sdk/bin and/or dart-sdk/bin/pub has been symlinked to. On MacOS, readlink |
dgrove
2013/05/30 19:46:38
pub => dartdoc
nweiz
2013/05/30 20:01:26
Done.
|
+# doesn't work with this case. |
+linked_path=`readlink "$0"` |
+if [ "$linked_path" = "" ]; then |
+ BIN_DIR="$(cd "${0%/*}" ; pwd -P)" |
+else |
+ BIN_DIR="$(cd "${linked_path%/*}" ; pwd -P)" |
dgrove
2013/05/30 19:46:38
I am not following what you're trying to do here.
nweiz
2013/05/30 20:01:26
If dart-sdk/bin/dartdoc is symlinked to, $0 will p
|
+fi |
+DART_SDK="$(cd "${BIN_DIR%/*}" ; pwd -P)" |
dgrove
2013/05/30 19:46:38
what is this used for?
nweiz
2013/05/30 20:01:26
Left over from the pub script; removed.
|
unset COLORS |
if test -t 1; then |