Fix bazelbuild#2982: Bazel installer should not check for installed JDK if using a bundled JDK.

philwo · dslomov · commit baca6e4cb023 · 2017-05-15T23:25:31.000+02:00
PiperOrigin-RevId: 156092071
diff --git a/scripts/packages/template_bin.sh b/scripts/packages/template_bin.sh
@@ -115,13 +115,20 @@ if [ -z "${JAVA_HOME-}" ]; then
       ;;
   esac
 fi
-if [ ! -x "${JAVA_HOME}/bin/javac" ]; then
-  echo >&2
-  echo "Java not found, please install the corresponding package" >&2
-  echo "See http://bazel.build/docs/install.html for more information on" >&2
-  echo "dependencies of Bazel." >&2
-  exit 1
-fi
+
+# Only check for an installed JDK if this version of Bazel does not contain a
+# bundled JDK.
+case "$0" in
+  *without-jdk*)
+  if [ ! -x "${JAVA_HOME}/bin/javac" ]; then
+    echo >&2
+    echo "Java not found, please install the corresponding package." >&2
+    echo "See http://bazel.build/docs/install.html for more information on" >&2
+    echo "dependencies of Bazel." >&2
+    exit 1
+  fi
+  ;;
+esac
 
 # Test for write access
 test_write "${bin}"
