From 42cb962cefd0285c3c73c48b6920df8ff6ad78c1 Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Wed, 11 Apr 2018 15:26:05 -0700
Subject: [PATCH] Apply review feedback.

---
 local_build/local_build.sh | 12 +++++++-----
 tests/compile/compile.sh   |  6 +++---
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/local_build/local_build.sh b/local_build/local_build.sh
index 44d02af23..c5122036c 100755
--- a/local_build/local_build.sh
+++ b/local_build/local_build.sh
@@ -30,14 +30,15 @@
 # Future work:
 # - Trim down Google's Apache licenses, to match the output of build.py.
 # - Generate other compressed files generated by build.py normally.
+# - Add a good error message if multiple versions of the closure compiler were
+#   found.
 
 # Find the Closure Compiler.
 if [ -f "$(npm root)/google-closure-compiler/compiler.jar" ]; then
-  # Travis test.
   COMPILER="$(npm root)/google-closure-compiler/compiler.jar"
-elif [ -f *compiler*.jar ]; then
-  # Manual test.
-  COMPILER="*compiler*.jar"
+elif [ -f closure-compiler*.jar ]; then
+  COMPILER="closure-compiler*.jar"
+  # TODO: Check whether multiple files were found.
 else
   echo "ERROR: Closure Compiler not found."
   echo "Download from this URL, and place jar file in current directory."
@@ -45,9 +46,10 @@ else
   exit 1
 fi
 
+echo Using $COMPILER as the compiler.
 rm local_blockly_compressed.js 2> /dev/null
 echo Compiling Blockly core...
-java -jar closure-compiler.jar \
+java -jar $COMPILER \
   --js='../core/**.js' \
   --js='../../closure-library/closure/goog/**.js' \
   --js='../../closure-library/third_party/closure/goog/**.js' \
diff --git a/tests/compile/compile.sh b/tests/compile/compile.sh
index b5e73ec04..9ddd44f35 100755
--- a/tests/compile/compile.sh
+++ b/tests/compile/compile.sh
@@ -1,17 +1,17 @@
 # Find the Closure Compiler.
 if [ -f "$(npm root)/google-closure-compiler/compiler.jar" ]; then
-  # Travis test.
   COMPILER="$(npm root)/google-closure-compiler/compiler.jar"
 elif [ -f *compiler*.jar ]; then
-  # Manual test.
   COMPILER="*compiler*.jar"
+  # TODO: Check whether multiple files were found.
 else
-	echo "ERROR: Closure Compiler not found."
+  echo "ERROR: Closure Compiler not found."
   echo "Download from this URL, and place jar file in current directory."
   echo "https://dl.google.com/closure-compiler/compiler-latest.zip"
   exit 1
 fi
 
+echo Using $COMPILER as the compiler.
 rm main_compressed.js 2> /dev/null
 echo Compiling Blockly...
 java -jar $COMPILER --js='main.js' \