This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch bugfix/osx
in repository x2goclient.
commit cbb174edbe20b1943e8798be136ea0698257f0f3
Author: Mihai Moldovan <io...@ionic.de>
Date: Thu Aug 27 04:56:56 2015 +0200
deduplicate.sh: record crafted "library path" values in duplicates
replacement to_files array.
---
debian/changelog | 2 ++
deduplicate.sh | 5 +++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 408e0d9..0b0a929 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -148,6 +148,8 @@ x2goclient (4.0.5.3-0x2go1) UNRELEASED; urgency=medium
iff any of the strings are present in otool's output and actually handle
the failure string *ARRAY* correctly as that.
- deduplicate.sh: change exit to return in parse_otool_output.
+ - deduplicate.sh: record crafted "library path" values in duplicates
+ replacement to_files array.
[ Bernard Cafarelli ]
* New upstream version (4.0.5.3):
diff --git a/deduplicate.sh b/deduplicate.sh
index 235d4b1..ab86a0b 100755
--- a/deduplicate.sh
+++ b/deduplicate.sh
@@ -117,9 +117,10 @@ for entry in "${duplicates[@]}"; do
if [ -n "${filename}" ] && [ -n "${all_entry_filename}" ]; then
if [ "${filename}" = "${all_entry_filename}" ]; then
- to_files+=( "${all_entry}" )
+ typeset
dependency_format="@executable_path/../Frameworks/${all_entry##${base_dir}}"
+ to_files+=( "${dependency_format}" )
- echo "${entry} => ${all_entry}"
+ echo "${entry} => ${dependency_format}"
# There should be only one entry matching, so
we can save a bit of time and break out of the loop.
# Even more importantly, we only want one entry
for each duplicates entry anyway...
--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email
on /srv/git/code.x2go.org/x2goclient.git
_______________________________________________
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits
