]> git.rm.cloudns.org Git - xonotic/netradiant.git/commitdiff
library-bundler: rely on gcp instead of cp on macos
authorThomas Debesse <dev@illwieckz.net>
Sat, 20 Feb 2021 13:23:41 +0000 (14:23 +0100)
committerThomas Debesse <dev@illwieckz.net>
Sat, 20 Feb 2021 19:38:26 +0000 (20:38 +0100)
library-bundler

index bf8622c4932969406a85d312429957867969cd17..e155abc751aac0da3d7f33af6a097a4b5ae6fa36 100755 (executable)
@@ -16,13 +16,13 @@ _sed () {
        esac
 }
 
-_cpr () {
+_cp () {
        case "${system_name}" in
                'macos')
-                       cp -R ${@}
+                       gcp -a --preserve=timestamps -H -L "${@}"
                        ;;
                *)
-                       cp -R --preserve=timestamps ${@}
+                       cp -a --preserve=timestamps -H -L "${@}"
                        ;;
        esac
 }
@@ -282,11 +282,7 @@ Multi::bundleGtkDepsFromFile () {
 
                                mkdir -p "${bundle_dir}/$(dirname "${bundle_component_dir}")"
 
-                               _cpr -H -L \
-                                       "${real_component_dir}" \
-                                       "${bundle_dir}/${bundle_component_dir}"
-
-                               touch -r \
+                               _cp \
                                        "${real_component_dir}" \
                                        "${bundle_dir}/${bundle_component_dir}"
 
@@ -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}"