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

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

commit 4921bfe032c00661fade563119c7c1fd59a4cad1
Author: Mihai Moldovan <io...@ionic.de>
Date:   Thu Jul 30 04:42:01 2015 +0200

    macbuild.sh: check current file name against regex, not a (now) full path.
---
 debian/changelog |    2 ++
 macbuild.sh      |    3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 346e7fe..4f6abba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -90,6 +90,8 @@ x2goclient (4.0.5.3-0x2go1) UNRELEASED; urgency=medium
       bundled, as something else will bundle them anyway.
     - macbuild.sh: use while-read-loop and find to actually recurse through
       directories.
+    - macbuild.sh: check current file name against regex, not a (now) full
+      path.
 
  -- X2Go Release Manager <git-ad...@x2go.org>  Mon, 19 Sep 2016 09:07:07 +0200
 
diff --git a/macbuild.sh b/macbuild.sh
index cbf9909..d0d5f8a 100755
--- a/macbuild.sh
+++ b/macbuild.sh
@@ -213,13 +213,14 @@ for cur_lib_or_libdir in ${PULSEAUDIO_LIBRARIES[@]}; do
                # -d '': specifies the delimiter to be used - as '' resolves to 
an empty string followed
                #        by a NUL character, the delimiter is set to this very 
NUL (\000) character.
                while read -r -d '' entry; do
+                       typeset cur_file="$(basename "${entry}")"
                        typeset 
TMP_REGEX='^.*\.(\.[0-9]+){0,2}(so|dylib|bundle)$'
 
                        # This is only here should the PA build system ever 
break and create
                        # "linux-style" library file names. Let's hope it never 
actually comes to that.
                        typeset 
TMP_REGEX_LINUX_COMPAT='^.*\.(so|dylib|bundle)(\.[0-9]+){0,2}$'
 
-                       if [[ "${entry}" =~ ${TMP_REGEX} ]] || [[ "${entry}" =~ 
${TMP_REGEX_LINUX_COMPAT} ]]; then
+                       if [[ "${cur_file}" =~ ${TMP_REGEX} ]] || [[ 
"${cur_file}" =~ ${TMP_REGEX_LINUX_COMPAT} ]]; then
                                # Filename matched the expected template.
                                PULSEAUDIO_LIBRARIES_FULL+=( 
"$(lazy_canonical_path "${cur_lib_or_libdir}/${entry}")" )
                        fi

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