Merge pull request #12798 from stevekuznetsov/skuznets/protobuf-better

Merged by openshift-bot

Author: OpenShift Bot

hack/update-generated-protobuf.sh

@@ -1,16 +1,19 @@
 #!/bin/bash
 source "$(dirname "${BASH_SOURCE}")/lib/init.sh"
 
-if ! os::util::find::system_binary 'protoc' || [[ "$(protoc --version)" != "libprotoc 3.0."* ]]; then
-  echo "Generating protobuf requires protoc 3.0.x. Please download and"
-  echo "install the platform appropriate Protobuf package for your OS: "
-  echo
-  echo "  https://github.com/google/protobuf/releases"
-  echo
-  if [[ "${PROTO_OPTIONAL:-}" == "1" ]]; then
-    exit 0
-  fi
-  exit 1
+if [[ "${PROTO_OPTIONAL:-}" == "1" ]]; then
+  os::log::warn "Skipping protobuf generation as \$PROTO_OPTIONAL is set."
+  exit 0
+fi
+
+os::util::ensure::system_binary_exists 'protoc'
+if [[ "$(protoc --version)" != "libprotoc 3.0."* ]]; then
+  os::log::fatal "Generating protobuf requires protoc 3.0.x. Please download and
+install the platform appropriate Protobuf package for your OS:
+
+  https://github.com/google/protobuf/releases
+
+To skip protobuf generation, set \$PROTO_OPTIONAL."
 fi
 
 os::util::ensure::gopath_binary_exists 'goimports'