[X2Go-Commits] [x2goclient] 83/142: deduplicate.sh: remove a bit of noisy debug output, but turn on parse_otool_output debugging.

git-admin at x2go.org git-admin at x2go.org
Thu Jan 14 05:10:25 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 d364f41622058913ba69fd8e5fdf9c2863fab32d
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Thu Aug 27 21:01:45 2015 +0200

    deduplicate.sh: remove a bit of noisy debug output, but turn on parse_otool_output debugging.
---
 debian/changelog |    2 ++
 deduplicate.sh   |    7 ++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a664372..a68dee0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -162,6 +162,8 @@ x2goclient (4.0.5.1-0x2go1) UNRELEASED; urgency=low
       not good enough as it needs a bit cleanup - coming up next.
     - deduplicate.sh: cleanup as announced in the last commit - using
       lazy_canonical_path.
+    - deduplicate.sh: remove a bit of noisy debug output, but turn on
+      parse_otool_output debugging.
   * 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 f8e5668..e357529 100755
--- a/deduplicate.sh
+++ b/deduplicate.sh
@@ -171,16 +171,17 @@ for all_entry in "${all_files[@]}"; do
 	typeset otool_out="$(otool -L "${all_entry}")"
 
 	typeset dependencies="$(parse_otool_output "${otool_out}")"
-	if [ "${?}" -eq 0 ]; then
+	echo "parse_otool_output return value: ${?}"
+	if [ "${?}" -eq "0" ]; then
 		typeset line=""
 		while read -r line; do
-			echo "dependency of ${all_entry}: ${line}"
+			#echo "dependency of ${all_entry}: ${line}"
 
 			typeset duplicate_entry=""
 			typeset -i i="0"
 			for i in "${!duplicates[@]}"; do
 				typeset duplicate_entry="${duplicates[${i}]}"
-				echo "checking for duplicate ${duplicate_entry}"
+				#echo "checking for duplicate ${duplicate_entry}"
 				typeset duplicate_format="$(lazy_canonical_path "${dependency_base_format}/${duplicate_entry}")"
 
 				if [ -n "${line}" ] && [ -n "${duplicate_format}" ]; then

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