[X2Go-Commits] [x2goclient] 01/02: macbuild.sh: sanitize find input, as BSD find and GNU find behave differently.

git-admin at x2go.org git-admin at x2go.org
Mon Feb 13 02:49:48 CET 2017


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goclient.

commit 812c4b8742446bc2a316a2032698cbd798dd5870
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Mon Feb 13 02:46:20 2017 +0100

    macbuild.sh: sanitize find input, as BSD find and GNU find behave differently.
---
 debian/changelog |    2 ++
 macbuild.sh      |    5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index faa6a70..78d5388 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -566,6 +566,8 @@ x2goclient (4.1.0.0-0x2go1) UNRELEASED; urgency=medium
       typo, whitespace, grammar fixes and other stuff.
     - res/i18n/x2goclient_sv.ts: remove obsolete comments and very minor
       whitespace fix.
+    - macbuild.sh: sanitize find input, as BSD find and GNU find behave
+      differently.
 
   [ Bernard Cafarelli ]
   * New upstream version (4.1.0.0):
diff --git a/macbuild.sh b/macbuild.sh
index e59db97..c22581f 100755
--- a/macbuild.sh
+++ b/macbuild.sh
@@ -404,8 +404,9 @@ 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}" )
+    typeset sanitized_entry="$(lazy_canonical_path "${entry}")"
+    echo "Adding ${sanitized_entry} to all files"
+    all_files+=( "${sanitized_entry}" )
   done < <(find "${base_dir}" -type 'f' -print0)
 
   typeset -a top_files

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