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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit a27df0e94ad6a8e37d94bf32fd64da705d7d7c3a
Author: Mihai Moldovan <io...@ionic.de>
Date:   Mon Jun 29 23:09:05 2015 +0200

    macbuild.sh: directories are "executable", so the first check must 
explicitly include a check for the argument being not a directory.
---
 debian/changelog |    2 ++
 macbuild.sh      |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 1135177..345cceb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -87,6 +87,8 @@ x2goclient (4.0.5.3-0x2go1) UNRELEASED; urgency=medium
       apart and be redone, because dylibbundler is not smart enough to handle
       our case.
     - macbuild.sh: add Linux library file name scheme regex as a precaution.
+    - macbuild.sh: directories are "executable", so the first check must
+      explicitly include a check for the argument being not a directory.
 
  -- X2Go Release Manager <git-ad...@x2go.org>  Mon, 19 Sep 2016 09:07:07 +0200
 
diff --git a/macbuild.sh b/macbuild.sh
index 9e9a1f8..a6b9224 100755
--- a/macbuild.sh
+++ b/macbuild.sh
@@ -203,7 +203,7 @@ fail="0"
 for cur_lib_or_libdir in ${PULSEAUDIO_LIBRARIES[@]}; do
        cur_lib_or_libdir="$(lazy_canonical_path 
"${MACPORTS_PREFIX}/lib/${cur_lib_or_libdir}")"
 
-       if [ -x "${cur_lib_or_libdir}" ]; then
+       if [ ! -d "${cur_lib_or_libdir}" ] && [ -x "${cur_lib_or_libdir}" ]; 
then
                PULSEAUDIO_LIBRARIES_FULL+=( "${cur_lib_or_libdir}" )
        elif [ -d "${cur_lib_or_libdir}" ]; then
                # That's a directory... more work needed here.

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
_______________________________________________
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

Reply via email to