Bläddra i källkod

Merge pull request #19247 from tiborvass/remove-tac

Make Makefile work on OS X
Tibor Vass 9 år sedan
förälder
incheckning
058e6dce18
1 ändrade filer med 4 tillägg och 4 borttagningar
  1. 4 4
      hack/make/.detect-daemon-osarch

+ 4 - 4
hack/make/.detect-daemon-osarch

@@ -2,17 +2,17 @@
 set -e
 
 # Retrieve OS/ARCH of docker daemon, eg. linux/amd64
-export DOCKER_ENGINE_OSARCH="$(docker version |tac|tac| awk '
+export DOCKER_ENGINE_OSARCH="$(docker version | awk '
 	$1 == "Client:" { server = 0; next }
 	$1 == "Server:" { server = 1; next }
-	server && $1 == "OS/Arch:" { print $2; exit }
+	server && $1 == "OS/Arch:" { print $2 }
 ')"
 export DOCKER_ENGINE_GOOS="${DOCKER_ENGINE_OSARCH%/*}"
 export DOCKER_ENGINE_GOARCH="${DOCKER_ENGINE_OSARCH##*/}"
 
 # and the client, just in case
-export DOCKER_CLIENT_OSARCH="$(docker version |tac|tac| awk '
+export DOCKER_CLIENT_OSARCH="$(docker version | awk '
 	$1 == "Client:" { client = 1; next }
 	$1 == "Server:" { client = 0; next }
-	client && $1 == "OS/Arch:" { print $2; exit }
+	client && $1 == "OS/Arch:" { print $2 }
 ')"