[X2Go-Commits] [x2goclient] 65/139: deduplicate.sh: fix parse_otool_output: we want to return failure only iff any of the strings are present in otool's output and actually handle the failure string *ARRAY* correctly as that.

git-admin at x2go.org git-admin at x2go.org
Sun Jan 17 06:03:06 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 806397963abaca9fe046600a861ee69795661457
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Thu Aug 27 04:53:44 2015 +0200

    deduplicate.sh: fix parse_otool_output: we want to return failure only iff any of the strings are present in otool's output and actually handle the failure string *ARRAY* correctly as that.
---
 debian/changelog |    3 +++
 deduplicate.sh   |    6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6ebbda0..3878b6d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -131,6 +131,9 @@ x2goclient (4.0.5.1-0x2go1) UNRELEASED; urgency=low
       "sparse" arrays correctly.
     - deduplicate.sh: quote "${arr[@]}" correctly to not suddenly force word
       splitting.
+    - deduplicate.sh: fix parse_otool_output: we want to return failure only
+      iff any of the strings are present in otool's output and actually handle
+      the failure string *ARRAY* correctly as that.
   * 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 33c4628..939eb55 100755
--- a/deduplicate.sh
+++ b/deduplicate.sh
@@ -15,9 +15,9 @@ parse_otool_output() {
 	typeset raw_output="${@}"
 
 	typeset fail_str=""
-	for fail_str in ${otool_fail_str}; do
-		if ! echo "${raw_output}" | grep -q "${fail_str}"; then
-			exit 1
+	for fail_str in "${otool_fail_str[@]}"; do
+		if echo "${raw_output}" | grep -q "${fail_str}"; then
+			return 1
 		fi
 	done
 

--
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