[X2Go-Commits] [x2goclient] 50/55: macbuild.sh: check current file name against regex, not a (now) full path.
git-admin at x2go.org
git-admin at x2go.org
Wed Aug 26 20:58:36 CEST 2015
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch bugfix/osx
in repository x2goclient.
commit 1bd0b49e88ebb83b5420d9c8b22356cd7f9aec81
Author: Mihai Moldovan <ionic at 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 067fc89..9b2b409 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -90,6 +90,8 @@ x2goclient (4.0.5.1-0x2go1) UNRELEASED; urgency=low
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.
[ Oleksandr Shneyder ]
* New upstream release (4.0.5.1):
diff --git a/macbuild.sh b/macbuild.sh
index 164fb6d..4465d7d 100755
--- a/macbuild.sh
+++ b/macbuild.sh
@@ -198,13 +198,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
More information about the x2go-commits
mailing list