Fix build on OS X when GNU sed is present.

See #20147, which fixed it when system default BSD sed was present but did not account for possibiliyt of GNU sed on OS X.

Fix build on OS X when GNU sed is present.
d0e36819 · Lorrin Nelson · 939b9848 · d0e36819
Commit d0e36819 authored Jul 07, 2016 by Lorrin Nelson
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 3 deletions

common.sh build/common.sh +7 -3

No files found.
--- a/build/common.sh
+++ b/build/common.sh
@@ -242,11 +242,15 @@ function kube::build::is_osx() {
  [[ "$(uname)" == "Darwin" ]]
 }

+function kube::build::is_gnu_sed() {
+  [[ $(sed --version 2>&1) == *GNU* ]]
+}
+
 function kube::build::update_dockerfile() {
-  if kube::build::is_osx; then
-    sed_opts=(-i '')
-  else
+  if kube::build::is_gnu_sed; then
    sed_opts=(-i)
+  else
+    sed_opts=(-i '')
  fi
  sed "${sed_opts[@]}" "s/KUBE_BUILD_IMAGE_CROSS_TAG/${KUBE_BUILD_IMAGE_CROSS_TAG}/" "${LOCAL_OUTPUT_BUILD_CONTEXT}/Dockerfile"
 }