firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove FLUTTER_DEV environment var

Browse Source 
This check is triggering even for folks who don't have FLUTTER_DEV set, which
is breaking their toolchain because we're not running `pub get` on the
flutter_tools package.
This commit is contained in:
Adam Barth 2016-02-09 12:55:54 -08:00
parent 7458ed226a
commit c83b663afd
2 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bin/flutter
View File

@ -15,11 +15,6 @@ SCRIPT_PATH="$FLUTTER_TOOLS_DIR/bin/flutter_tools.dart"
# TODO(abarth): We shouldn't require dart to be on the user's path. # TODO(abarth): We shouldn't require dart to be on the user's path.
DART=dart DART=dart
if [ -n $FLUTTER_DEV ]; then
$DART --checked --package-root="$FLUTTER_TOOLS_DIR/packages" "$SCRIPT_PATH" "$@"
exit 0
fi
REVISION=`(cd "$FLUTTER_ROOT"; git rev-parse HEAD)` REVISION=`(cd "$FLUTTER_ROOT"; git rev-parse HEAD)`
if [ ! -f "$SNAPSHOT_PATH" ] || [ ! -f "$STAMP_PATH" ] || [ `cat "$STAMP_PATH"` != "$REVISION" ] || [ "$FLUTTER_TOOLS_DIR/pubspec.yaml" -nt "$FLUTTER_TOOLS_DIR/pubspec.lock" ]; then if [ ! -f "$SNAPSHOT_PATH" ] || [ ! -f "$STAMP_PATH" ] || [ `cat "$STAMP_PATH"` != "$REVISION" ] || [ "$FLUTTER_TOOLS_DIR/pubspec.yaml" -nt "$FLUTTER_TOOLS_DIR/pubspec.lock" ]; then
echo Updating flutter tool... echo Updating flutter tool...

5
bin/flutter.bat
View File

@ -13,11 +13,6 @@ SET script_path=%flutter_tools_dir%\bin\flutter_tools.dart
REM TODO: Don't require dart to be on the user's path REM TODO: Don't require dart to be on the user's path
SET dart=dart SET dart=dart
IF "%FLUTTER_DEV%" == "" GOTO no_flutter_dev
CALL %dart% --checked --package-root="%flutter_tools_dir%\packages" "%script_path%" %*
EXIT /B %ERRORLEVEL%
:no_flutter_dev
REM Set current working directory to the flutter directory REM Set current working directory to the flutter directory
PUSHD %flutter_root% PUSHD %flutter_root%
REM IF doesn't have an "or". Instead, just use GOTO REM IF doesn't have an "or". Instead, just use GOTO