From: Thomas Debesse <dev@illwieckz.net>
Date: Sat, 20 Feb 2021 13:23:41 +0000 (+0100)
Subject: library-bundler: rely on gcp instead of cp on macos
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=33a2b111caec82c121ee5431a57db42044956e90;p=xonotic%2Fnetradiant.git

library-bundler: rely on gcp instead of cp on macos
---

diff --git a/library-bundler b/library-bundler
index bf8622c4..e155abc7 100755
--- a/library-bundler
+++ b/library-bundler
@@ -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}"