fixup! Ensure that we build only with java 1.7

tumblr · Sep 26, 2016 · bc23869 · bc23869
1 parent e9dbebe
commit bc23869
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/scripts/package.sh b/scripts/package.sh
@@ -20,8 +20,8 @@ fi
 
 java_version=$(java -version 2>&1 | awk -F '"' '/version/ {print $2}')
 echo "Building using java version $java_version"
-if [[ ! "$java_version" =~ "1.7" ]] || [[ $FORCE_BUILD == "true" ]]; then
-    echo "Collins should only be built with java version 1.7.  If you really know what you are doing, set the $FORCE_BUILD enviornment variable to 'true'"
+if [[ ! "$java_version" =~ "1.7" ]] && [[ ! $FORCE_BUILD == "true" ]]; then
+    echo "Collins should only be built with java version 1.7.  If you really know what you are doing, set the FORCE_BUILD enviornment variable to 'true'"
     exit 1
 fi