This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch bugfix/osx
in repository x2goclient.
commit a020de658c5ca9b7dc9999437af7377a5d6f5224
Author: Mihai Moldovan <io...@ionic.de>
Date: Thu Aug 27 20:36:33 2015 +0200
deduplicate.sh: save dependency format base string as a readonly variable
and use that instead of repeating a fixed string.
---
debian/changelog | 2 ++
deduplicate.sh | 4 +++-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 5d74f8d..0fd0d9a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -137,6 +137,8 @@ x2goclient (4.0.5.3-0x2go1) UNRELEASED; urgency=medium
which is - hopefully - the id line.
- deduplicate.sh: actually include file name in install_name_tool pseudo
output.
+ - deduplicate.sh: save dependency format base string as a readonly
+ variable and use that instead of repeating a fixed string.
-- X2Go Release Manager <git-ad...@x2go.org> Mon, 19 Sep 2016 09:07:07 +0200
diff --git a/deduplicate.sh b/deduplicate.sh
index f020b9c..130a04e 100755
--- a/deduplicate.sh
+++ b/deduplicate.sh
@@ -6,6 +6,8 @@ base_dir="${1:?"No base dir given."}"
typeset -a special_files_regex
special_files_regex+=( "pulseaudio/libpulsecommon-[0-9]\.[0-9]\.dylib" )
+typeset -r dependency_base_format='@executable_path/../Frameworks/'
+
typeset -a otool_fail_str
otool_fail_str=( "is not an object file"
"can't open file"
@@ -134,7 +136,7 @@ for entry in "${duplicates[@]}"; do
if [ -n "${filename}" ] && [ -n "${all_entry_filename}" ]; then
if [ "${filename}" = "${all_entry_filename}" ]; then
- typeset
dependency_format="@executable_path/../Frameworks/${all_entry##${base_dir}}"
+ typeset
dependency_format="${dependency_base_format}/${all_entry##${base_dir}}"
to_files+=( "${dependency_format}" )
echo "${entry} => ${dependency_format}"
--
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
