diff options
| author |  Paul Cody Johnston <pcj@pubref.org> | 2016-09-06 19:37:10 +0000 |
|---|---|---|
| committer |  Yue Gan <yueg@google.com> | 2016-09-07 10:37:54 +0000 |
| commit | 02211a6fc044e1a6bb8ffc8a0a8bf02766fe99ed (patch) | |
| tree | 0b67cf4c5cb5609400d667a70b1071dd7f5f3a3e /tools/build_defs/docker | |
| parent | 317eddb6b15ecbb53bd65bebac2b061630b69c1b (diff) | |
Remove dependency on gnu sed
BSD sed (the default on osx) does not support the -r --regexp-extended flag. Fixes #1651
Closes #1716.
--
Reviewed-on: https://github.com/bazelbuild/bazel/pull/1716
MOS_MIGRATED_REVID=132350276
Diffstat (limited to 'tools/build_defs/docker')
| -rw-r--r-- | tools/build_defs/docker/incremental_load.sh.tpl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/build_defs/docker/incremental_load.sh.tpl b/tools/build_defs/docker/incremental_load.sh.tpl index a563b9dc22..2210ceb913 100644 --- a/tools/build_defs/docker/incremental_load.sh.tpl +++ b/tools/build_defs/docker/incremental_load.sh.tpl @@ -24,8 +24,8 @@ DOCKER="${DOCKER:-docker}" FULL_DOCKER_VERSION=$(docker version -f {{.Server.Version}} 2> /dev/null \ || echo "1.5.0") -DOCKER_MAJOR_VERSION=$(echo "$FULL_DOCKER_VERSION" | sed -r 's#^([0-9]+)\..*#\1#') -DOCKER_MINOR_VERSION=$(echo "$FULL_DOCKER_VERSION" | sed -r 's#^[0-9]+\.([0-9]+).*#\1#') +DOCKER_MAJOR_VERSION=$(echo "$FULL_DOCKER_VERSION" | awk -F\. '{ print $1 }') +DOCKER_MINOR_VERSION=$(echo "$FULL_DOCKER_VERSION" | awk -F\. '{ print $2 }') if [ "$DOCKER_MAJOR_VERSION" -eq "1" ] && [ "$DOCKER_MINOR_VERSION" -lt "10" ]; then LEGACY_DOCKER=true else |