kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

Merge pull request #39836 from thaJeztah/hack_linting_nits 

hack/make/binary-daemon: fix some linting issues
This commit is contained in:
Kirill Kolyshkin 2019-09-02 16:45:24 +03:00 committed by GitHub
parent c0ef45e90c 70d3677825
commit d99b0302d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hack/make/binary-daemon
View File

@ -15,16 +15,16 @@ copy_binaries() {
fi fi
echo "Copying nested executables into $dir" echo "Copying nested executables into $dir"
for file in containerd containerd-shim ctr runc docker-init docker-proxy rootlesskit rootlesskit-docker-proxy dockerd-rootless.sh; do for file in containerd containerd-shim ctr runc docker-init docker-proxy rootlesskit rootlesskit-docker-proxy dockerd-rootless.sh; do
cp -f `which "$file"` "$dir/" cp -f "$(command -v "$file")" "$dir/"
if [ "$hash" == "hash" ]; then if [ "$hash" = "hash" ]; then
hash_files "$dir/$file" hash_files "$dir/$file"
fi fi
done done
# vpnkit is amd64 only # vpnkit is amd64 only
if which "vpnkit.$(uname -m)" 2>&1 >/dev/null; then if command -v "vpnkit.$(uname -m)" 2>&1 >/dev/null; then
cp -f `which "vpnkit.$(uname -m)"` "$dir/vpnkit" cp -f "$(command -v "vpnkit.$(uname -m)")" "$dir/vpnkit"
if [ "$hash" == "hash" ]; then if [ "$hash" = "hash" ]; then
hash_files "$dir/vpnkit" hash_files "$dir/vpnkit"
fi fi
fi fi