Merge pull request #28268 from cjcullen/expr

Automatic merge from submit-queue Make GKE detect-instance-groups work on Mac. Make the fix from #27803 also work on mac. The GNU `expr` command supports both the `expr match STRING REGEXP` and `expr STRING : REGEXP` command syntax. The BSD `expr` command only has the `expr STRING : REGEXP` syntax. @fabioy @a-robinson

Merge pull request #28268 from cjcullen/expr
85f75daf · k8s-merge-robot · GitHub · 40b8fb47 · 65ab7040 · 85f75daf
Commit 85f75daf authored Jul 01, 2016 by k8s-merge-robot Committed by GitHub Jul 01, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

util.sh cluster/gke/util.sh +1 -1

No files found.
--- a/cluster/gke/util.sh
+++ b/cluster/gke/util.sh
@@ -318,7 +318,7 @@ function detect-node-instance-groups {
  ALL_INSTANCE_GROUP_URLS=${urls[*]}
  NODE_INSTANCE_GROUPS=()
  for url in "${urls[@]:-}"; do
-    local igm_zone=$(expr match ${url} '.*/zones/\([a-z0-9-]*\)/')
+    local igm_zone=$(expr ${url} : '.*/zones/\([a-z0-9-]*\)/')
    if [[ "${igm_zone}" == "${ZONE}" ]]; then
      NODE_INSTANCE_GROUPS+=("${url##*/}")
    fi