Browse code

hack/make: remove 'docker-' prefix when copying binaries

Signed-off-by: Tibor Vass <tibor@docker.com>

Tibor Vass authored on 2018/09/26 01:56:40
Showing 1 changed files
... ...
@@ -10,14 +10,14 @@ copy_binaries() {
10 10
 	if [ "$(go env GOOS)/$(go env GOARCH)" != "$(go env GOHOSTOS)/$(go env GOHOSTARCH)" ]; then
11 11
 		return
12 12
 	fi
13
-	if [ ! -x /usr/local/bin/docker-runc ]; then
13
+	if [ ! -x /usr/local/bin/runc ]; then
14 14
 		return
15 15
 	fi
16 16
 	echo "Copying nested executables into $dir"
17
-	for file in containerd containerd-shim containerd-ctr runc init proxy; do
18
-		cp -f `which "docker-$file"` "$dir/"
17
+	for file in containerd containerd-shim ctr runc docker-init docker-proxy; do
18
+		cp -f `which "$file"` "$dir/"
19 19
 		if [ "$hash" == "hash" ]; then
20
-			hash_files "$dir/docker-$file"
20
+			hash_files "$dir/$file"
21 21
 		fi
22 22
 	done
23 23
 }