[X2Go-Commits] [x2goclient] 172/257: macbuild.sh: save return value of parse_otool_output ().

git-admin at x2go.org git-admin at x2go.org
Mon Nov 28 16:05:58 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 557d11596d916f2cc2bd459c163756a0489db112
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Thu May 12 23:24:03 2016 +0200

    macbuild.sh: save return value of parse_otool_output ().
    
    Otherwise we'll fetch the return value of "set", which is not really
    what we need.
---
 debian/changelog |    2 ++
 macbuild.sh      |    4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index d04c683..a51c296 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -289,6 +289,8 @@ x2goclient (4.0.5.3-0x2go1) UNRELEASED; urgency=medium
     - macbuild.sh: fix copying of resource files.
     - macbuild.sh: also add PA binaries to deduplication fixup list.
     - macbuild.sh: don't error out while executing parse_otool_output ().
+    - macbuild.sh: save return value of parse_otool_output (). Otherwise we'll
+      fetch the return value of "set", which is not really what we need.
 
   [ Bernard Cafarelli ]
   * New upstream version (4.0.5.3):
diff --git a/macbuild.sh b/macbuild.sh
index 62afe22..5e7b336 100755
--- a/macbuild.sh
+++ b/macbuild.sh
@@ -515,6 +515,7 @@ if [ "${BUNDLE}" = "1" ]; then
   # Try to fixup files broken by duplicates removal.
   for all_entry in "${all_files[@]}"; do
     typeset otool_out="$(otool -L "${all_entry}")"
+    typeset -i tmp_ret="0"
 
     # Don't merge the declaration and initialization with the real value assignment.
     # We need the return value of parse_otool_output(), but running
@@ -522,9 +523,10 @@ if [ "${BUNDLE}" = "1" ]; then
     typeset dependencies=""
     set +e
     dependencies="$(parse_otool_output "${otool_out}")"
+    tmp_ret="${?}"
     set -e
 
-    if [ "${?}" -eq "0" ]; then
+    if [ "${tmp_ret}" -eq "0" ]; then
       typeset line=""
       while read -r line; do
         #echo "dependency of ${all_entry}: ${line}"

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