From 02211a6fc044e1a6bb8ffc8a0a8bf02766fe99ed Mon Sep 17 00:00:00 2001 From: Paul Cody Johnston Date: Tue, 6 Sep 2016 19:37:10 +0000 Subject: 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 --- tools/build_defs/docker/incremental_load.sh.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tools/build_defs/docker') 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 -- cgit v1.2.3