Fix build on OS X when GNU sed is present.

See kubernetes#20147, which fixed it when system default BSD sed was present but did not account for possibiliyt of GNU sed on OS X.
lavalamp · Jul 7, 2016 · d0e3681 · d0e3681
1 parent 939b984
commit d0e3681
Showing 1 changed file with 7 additions and 3 deletions.
diff --git 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"
 }