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

[git-admin]

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

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

commit 710abc494bac28ec238609cf379637d3a3ae1bea
Author: Mihai Moldovan 
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 6af65a2..fe914ed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -118,6 +118,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.
 
  -- X2Go Release Manager   Mon, 19 Sep 2016 09:07:07 +0200
 
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

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

[git-admin]

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

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

commit 1a742122ebcb3aad479af10a8ec247a469e811c7
Author: Mihai Moldovan 
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 201186c..9d4c86d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -151,6 +151,8 @@ x2goclient (4.0.5.2-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.
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
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