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

Unified Diff: third_party/pkg/angular/scripts/env.sh

Issue 180843004: Revert revision 33053 (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 6 years, 10 months 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
Index: third_party/pkg/angular/scripts/env.sh
===================================================================
--- third_party/pkg/angular/scripts/env.sh (revision 33054)
+++ third_party/pkg/angular/scripts/env.sh (working copy)
@@ -1,36 +1,27 @@
#!/bin/sh
set -e
-
-if [ -n "$DART_SDK" ]; then
- DARTSDK=$DART_SDK
+DART=`which dart|cat` # pipe to cat to ignore the exit code
+export DARTSDK=`which dart | sed -e 's/\/dart\-sdk\/.*$/\/dart-sdk/'`
+if [ "$DARTSDK" = "/Applications/dart/dart-sdk" ]; then
+ # Assume we are a mac machine with standard dart setup
+ export DARTIUM="/Applications/dart/chromium/Chromium.app/Contents/MacOS/Chromium"
else
- echo "sdk=== $DARTSDK"
- DART=`which dart|cat` # pipe to cat to ignore the exit code
- DARTSDK=`which dart | sed -e 's/\/dart\-sdk\/.*$/\/dart-sdk/'`
-
- if [ "$DARTSDK" = "/Applications/dart/dart-sdk" ]; then
- # Assume we are a mac machine with standard dart setup
- export DARTIUM="/Applications/dart/chromium/Chromium.app/Contents/MacOS/Chromium"
- else
- DARTSDK="`pwd`/dart-sdk"
- case $( uname -s ) in
- Darwin)
- export DARTIUM=${DARTIUM:-./dartium/Chromium.app/Contents/MacOS/Chromium}
- ;;
- Linux)
- export DARTIUM=${DARTIUM:-./dartium/chrome}
- ;;
- esac
- fi
+ export DARTSDK="`pwd`/dart-sdk"
+ case $( uname -s ) in
+ Darwin)
+ export DARTIUM=${DARTIUM:-./dartium/Chromium.app/Contents/MacOS/Chromium}
+ ;;
+ Linux)
+ export DARTIUM=${DARTIUM:-./dartium/chrome}
+ ;;
+ esac
fi
-
-export DART_SDK="$DARTSDK"
export DART=${DART:-"$DARTSDK/bin/dart"}
export PUB=${PUB:-"$DARTSDK/bin/pub"}
export DARTANALYZER=${DARTANALYZER:-"$DARTSDK/bin/dartanalyzer"}
export DARTDOC=${DARTDOC:-"$DARTSDK/bin/dartdoc"}
-export DART_DOCGEN=${DART_DOCGEN:-"$DARTSDK/bin/docgen"}
+
export CHROME_CANARY_BIN=${CHROME_CANARY_BIN:-"$DARTIUM"}
export CHROME_BIN=${CHROME_BIN:-"google-chrome"}
export DART_FLAGS='--enable_type_checks --enable_asserts'
« no previous file with comments | « third_party/pkg/angular/scripts/changelog/authors.sh ('k') | third_party/pkg/angular/scripts/generate-documentation.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698