Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(489)

Unified Diff: sdk/bin/dartanalyzer_developer

Issue 68503004: Support symlinking to dart-sdk executables on Linux and Mac. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« sdk/bin/dart2js ('K') | « sdk/bin/dartanalyzer ('k') | sdk/bin/dartdoc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sdk/bin/dartanalyzer_developer
diff --git a/sdk/bin/dartanalyzer_developer b/sdk/bin/dartanalyzer_developer
index 5639355e16fd89d68c6820922a0216e22b0f6efa..94d9346590f9043d628d39485421c3142a3d465b 100755
--- a/sdk/bin/dartanalyzer_developer
+++ b/sdk/bin/dartanalyzer_developer
@@ -8,14 +8,6 @@
# the testing infrastructure.
set -e
-function follow_links() {
- while [ -h "$1" ]; do
- # On Mac OS, readlink -f doesn't work.
- 1="$(readlink "$1")"
- done
- echo "$1"
-}
-
FOUND_BATCH=0
for ARG in "$@"
do
@@ -28,12 +20,11 @@ do
esac
done
-# 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)")"
-
+# Setting BIN_DIR this way is ugly, but is needed to handle the case where
+# dart-sdk/bin or the script itself has been symlinked to. On MacOS, readlink -f
+# doesn't work with this case.
+SCRIPT=`readlink "$0" || echo "$0"`
+CUR_DIR="$(cd "${SCRIPT%/*}" ; pwd -P)"
SDK_DIR="$(cd "${CUR_DIR}/.." ; pwd -P)"
if [ -z "$DART_CONFIGURATION" ];
« sdk/bin/dart2js ('K') | « sdk/bin/dartanalyzer ('k') | sdk/bin/dartdoc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698