Mirrors/xxh
2
0
Fork 0
mirror of https://github.com/xxh/xxh synced 2024-11-14 16:27:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Preserve symbolic links when copying files via cp.

Browse source 
On GNU/Linux `cp -r` and `cp -R` behind identically, and symbolic links
are preserved.

However, on macOS they behave differently: `cp -r` will copy the
indirected symbolic link (i.e the content is copied, resulting in a
regular file).

This patch changes all occurrences of `cp -r` with `cp -R`.

Tested on:

 - macOS 12.6 (Monterey)
 - Ubuntu 18.04 LTS
 - Ubuntu 22.04 LTS

This closes #148
This commit is contained in:
Robert Meerman 2022-09-27 16:05:18 +01:00
parent df3b5562ff
commit e481cc9a30
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
xxh/xxh_xxh/xxh.py
View file

@ -494,7 +494,7 @@ class xxh:
self.eprint(f"Package source path: {package_source}")
package_source = p(package_source)
if package_source.exists():
self.S(f'mkdir -p {package_dir} && cp -r {package_source}/* {package_dir}')
self.S(f'mkdir -p {package_dir} && cp -R {package_source}/* {package_dir}')
else:
self.eeprint(f'Unknown source type: {package_source_type}')
@ -1074,7 +1074,7 @@ class xxh:
elif copy_method == 'cp':
self.eprint('First time copying using cp (this will be omitted on the next time)')
self.S('{bb}cp -r {shell_build_dir} {host_xxh_shell_dir}/ 1>&2{be}'.format(
self.S('{bb}cp -R {shell_build_dir} {host_xxh_shell_dir}/ 1>&2{be}'.format(
bb=bash_wrap_begin,
be=bash_wrap_end,
shell_build_dir=shell_build_dir,
@ -1084,7 +1084,7 @@ class xxh:
for local_plugin_dir in list(local_plugins_dir.glob(f'xxh-plugin-prerun-*')) + list(local_plugins_dir.glob(f'xxh-plugin-{self.short_shell_name}-*')):
local_plugin_build_dir = local_plugin_dir/'build'
local_plugin_name = local_plugin_dir.name
self.S('{bb}cp -r {local_plugin_build_dir}/* {host_xxh_plugins_dir}/{local_plugin_name}/build/ 1>&2{be}'.format(
self.S('{bb}cp -R {local_plugin_build_dir}/* {host_xxh_plugins_dir}/{local_plugin_name}/build/ 1>&2{be}'.format(
bb=bash_wrap_begin,
be=bash_wrap_end,
local_plugin_build_dir=local_plugin_build_dir,