[X2Go-Commits] [x2goclient] 88/139: macbuild.sh: more debug messages and a whitespace change.
git-admin at x2go.org
git-admin at x2go.org
Wed Jan 13 17:27:49 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 62032119279977d8a6a11a73c88fc838d65a7b28
Author: Mihai Moldovan <ionic at ionic.de>
Date: Wed Sep 30 23:22:57 2015 +0200
macbuild.sh: more debug messages and a whitespace change.
---
debian/changelog | 1 +
macbuild.sh | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index ecf7740..a016e1b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -168,6 +168,7 @@ x2goclient (4.0.5.1-0x2go1) UNRELEASED; urgency=low
- macbuild.sh: merge deduplicate.sh content in. Also enable the
functionality "for real", not just as a dry-run.
- macbuild.sh: spelling fix.
+ - macbuild.sh: more more debug messages and a whitespace change.
* 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/macbuild.sh b/macbuild.sh
index 2b8dec9..64e9dc8 100755
--- a/macbuild.sh
+++ b/macbuild.sh
@@ -113,7 +113,6 @@ parse_otool_output() {
typeset tmp_regex='^[[:space:]]+(.*)[[:space:]]\(compatibility version .*, current version .*\)'
-
# In this special case, we do not want read to perform any word splitting.
typeset oldifs="${IFS}"
IFS=''
@@ -374,6 +373,7 @@ if [ "${BUNDLE}" = "1" ]; then
typeset -a all_files
typeset entry=""
while read -r -d '' entry; do
+ echo "Adding ${entry} to all files"
all_files+=( "${entry}" )
done < <(find "${base_dir}" -type 'f' -print0)
@@ -381,6 +381,7 @@ if [ "${BUNDLE}" = "1" ]; then
for entry in "${all_files[@]}"; do
typeset relative_path="${entry##"${base_dir}/"}"
typeset tmp_regex='^[^/]+$'
+ echo "Checking ${relative_path} against regex '${tmp_regex}'"
if [[ "${relative_path}" =~ ${tmp_regex} ]]; then
echo "${relative_path} is top file, adding to array."
top_files+=( "${relative_path}" )
--
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