beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #30970 from cmehay/install

Browse source 
Force copy on make install to avoid Text file busy error
This commit is contained in:
Brian Goff 2017-02-13 13:49:46 -05:00 committed by GitHub
commit 6fb658eaed
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
hack/make.sh
View file

@ -237,7 +237,7 @@ copy_binaries() {
if [ -x /usr/local/bin/docker-runc ]; then if [ -x /usr/local/bin/docker-runc ]; then
echo "Copying nested executables into $dir" echo "Copying nested executables into $dir"
for file in containerd containerd-shim containerd-ctr runc init proxy; do for file in containerd containerd-shim containerd-ctr runc init proxy; do
cp `which "docker-$file"` "$dir/" cp -f `which "docker-$file"` "$dir/"
if [ "$2" == "hash" ]; then if [ "$2" == "hash" ]; then
hash_files "$dir/docker-$file" hash_files "$dir/docker-$file"
fi fi
@ -252,7 +252,7 @@ install_binary() {
if [ "$(go env GOOS)" == "linux" ]; then if [ "$(go env GOOS)" == "linux" ]; then
echo "Installing $(basename $file) to ${target}" echo "Installing $(basename $file) to ${target}"
mkdir -p "$target" mkdir -p "$target"
cp -L "$file" "$target" cp -f -L "$file" "$target"
else else
echo "Install is only supported on linux" echo "Install is only supported on linux"
return 1 return 1