[X2Go-Commits] [x2goclient] 67/139: deduplicate.sh: record crafted "library path" values in duplicates replacement to_files array.

git-admin at x2go.org git-admin at x2go.org
Sun Jan 17 06:03:07 CET 2016


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit 6e58a18ba3bdc3729ff4d08fce53a0d36ec46b3a
Author: Mihai Moldovan <ionic at 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 b12bf25..3d2823d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -135,6 +135,8 @@ x2goclient (4.0.5.1-0x2go1) UNRELEASED; urgency=low
       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.
   * debian/control:
     - Change apache2-dev | libc6-dev build dependency back to apache2-dev
       only. Otherwise, apache2-dev is not installed at all, even though
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


More information about the x2go-commits mailing list