From 131414aaad84f44d559af08b1877ba9e819150c2 Mon Sep 17 00:00:00 2001
From: Patrice Chalin <pchalin@gmail.com>
Date: Mon, 10 Sep 2018 15:12:22 -0400
Subject: [PATCH] Set FLUTTER_ROOT in env-set.sh

---
 tool/before-install.sh | 10 ++--------
 tool/check-code.sh     |  2 ++
 tool/env-set.sh        |  8 ++++++++
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/tool/before-install.sh b/tool/before-install.sh
index 5af2f6eb4f..82ab5abf2b 100755
--- a/tool/before-install.sh
+++ b/tool/before-install.sh
@@ -1,15 +1,9 @@
 #!/usr/bin/env bash
 
-FLUTTER_ROOT=flutter
-FLUTTER_BIN="$FLUTTER_ROOT/bin"
-
-if [[ ! -e "$FLUTTER_ROOT" ]]; then
-  echo "ERROR: The ~/flutter git submodule is missing. For initialization instructions, see the repo README."
-  exit 1;
-fi
-
 source tool/shared/before-install.sh
 
+# Site-specific settings here: currently, none.
+
 travis_fold start before_install.flutter
 echo "Refreshing Flutter repo and running doctor:"
 (
diff --git a/tool/check-code.sh b/tool/check-code.sh
index c947c93c1f..ede95bae6a 100755
--- a/tool/check-code.sh
+++ b/tool/check-code.sh
@@ -2,4 +2,6 @@
 
 set -e # Fast fail the script on failures.
 
+[[ -z "$DART_SITE_ENV_DEFS" ]] && . ./tool/env-set.sh
+
 exec ./tool/build_check_deploy.sh --no-build --no-check-links
diff --git a/tool/env-set.sh b/tool/env-set.sh
index c8ce68f28a..804068888e 100644
--- a/tool/env-set.sh
+++ b/tool/env-set.sh
@@ -3,3 +3,11 @@
 source tool/shared/env-set.sh
 
 # Site-specific settings here: currently, none.
+
+export FLUTTER_ROOT=flutter
+export FLUTTER_BIN="$FLUTTER_ROOT/bin"
+
+if [[ ! -e "$FLUTTER_ROOT" ]]; then
+  echo "ERROR: The ~/flutter git submodule is missing. For initialization instructions, see the repo README."
+  exit 1;
+fi