Skip to content

Commit e679a26

Browse files
authored
fix: use -R instead of -r in cp calls so macos & linxu behavior is the same (#58)
1 parent e30e89f commit e679a26

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

lib/private/copy_file.bzl

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ def copy_cmd(ctx, src_file, src_path, dst):
8585
# buildifier: disable=function-docstring
8686
def copy_bash(ctx, src_file, src_path, dst):
8787
if dst.is_directory:
88-
cmd_tmpl = "rm -rf \"$2\" && cp -rf \"$1/\" \"$2\""
88+
cmd_tmpl = "rm -rf \"$2\" && cp -fR \"$1/\" \"$2\""
8989
mnemonic = "CopyDirectory"
9090
progress_message = "Copying directory %s" % src_path
9191
else:

lib/private/copy_to_directory.bzl

+1-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ if [[ -f "{src}" ]]; then
9090
cp -f "{src}" "{dst}"
9191
else
9292
mkdir -p "{dst}"
93-
cp -rf "{src}"/* "{dst}"
93+
cp -fR "{src}"/* "{dst}"
9494
fi
9595
""".format(src = src_path, dst_dir = skylib_paths.dirname(dst_path), dst = dst_path))
9696

lib/private/write_source_file.bzl

+1-1
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ if [[ -f "$in" ]]; then
167167
chmod 664 "$out"
168168
else
169169
mkdir -p "$out"
170-
cp -rf "$in"/* "$out"
170+
cp -fR "$in"/* "$out"
171171
chmod 664 "$out"/*
172172
fi
173173
""".format(in_path = in_path, out_path = out_path))

0 commit comments

Comments
 (0)