[X2Go-Commits] [x2goclient] 46/126: macbuild.sh: directories are "executable", so the first check must explicitly include a check for the argument being not a directory.

[git-admin at x2go.org]

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

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

commit 3ac2b8def4014b443fbdda53745f522ad8d86242
Author: Mihai Moldovan <ionic at 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 0fb8fb6..1949112 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -90,6 +90,8 @@ x2goclient (4.0.5.1-0x2go1) UNRELEASED; urgency=low
       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.
 
   [ Oleksandr Shneyder ]
   * New upstream release (4.0.5.1):
diff --git a/macbuild.sh b/macbuild.sh
index 33d7231..0df3f3d 100755
--- a/macbuild.sh
+++ b/macbuild.sh
@@ -188,7 +188,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