X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=library-bundler;h=a1ac9ebf6a645026c303f725ce03868e20f98b79;hb=90f54911568e6f9b47a5e7561665d92d36eaccfd;hp=62f48f12784bfe025c1bd779ff3861c147d913cf;hpb=41d1f1587bc636a5a23f77ab9ae80a6f52a6dbab;p=xonotic%2Fnetradiant.git diff --git a/library-bundler b/library-bundler index 62f48f12..a1ac9ebf 100755 --- a/library-bundler +++ b/library-bundler @@ -16,13 +16,13 @@ _sed () { esac } -_cpr () { +_cp () { case "${system_name}" in 'macos') - cp -R ${@} + gcp -R --preserve=timestamps -H -L "${@}" ;; *) - cp -R --preserve=timestamps ${@} + cp -R --preserve=timestamps -H -L "${@}" ;; esac } @@ -282,14 +282,10 @@ Multi::bundleGtkDepsFromFile () { mkdir -p "${bundle_dir}/$(dirname "${bundle_component_dir}")" - _cpr -H -L \ + _cp \ "${real_component_dir}" \ "${bundle_dir}/${bundle_component_dir}" - touch -r \ - "/${real_component_dir}" \ - "${bundle_dir}/${bundle_component_dir}" - Multi::rewriteLoadersCache "${bundle_dir}/${bundle_component_dir}" fi done @@ -317,11 +313,7 @@ Multi::bundleLibFromFile () { continue fi - cp -H \ - "${lib_file}" \ - "${lib_dir}/${lib_basename}" - - touch -r \ + _cp \ "${lib_file}" \ "${lib_dir}/${lib_basename}"