[X2Go-Commits] [x2goclient] 45/52: macbuild.sh: add Linux library file name scheme regex as a precaution.

git-admin at x2go.org git-admin at x2go.org
Thu Jul 30 04:47:13 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 8c353cb838f73c630dce07b0f7b004f9e0f6d9ae
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Mon Jun 29 23:03:23 2015 +0200

    macbuild.sh: add Linux library file name scheme regex as a precaution.
---
 debian/changelog |    1 +
 macbuild.sh      |    9 +++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d5779a5..db6dc30 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -79,6 +79,7 @@ x2goclient (4.0.5.1-0x2go1) UNRELEASED; urgency=low
     - macbuild.sh: add work-in-progress PulseAudio bundling. Needs to be ripped
       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.
 
  -- X2Go Release Manager <git-admin at x2go.org>  Tue, 28 Jul 2015 06:05:27 +0200
 
diff --git a/macbuild.sh b/macbuild.sh
index 7b69dcf..2a8f54b 100755
--- a/macbuild.sh
+++ b/macbuild.sh
@@ -194,8 +194,13 @@ for cur_lib_or_libdir in ${PULSEAUDIO_LIBRARIES[@]}; do
 		# That's a directory... more work needed here.
 		typeset entry=""
 		for entry in "${cur_lib_or_libdir}"/*; do
-			typeset TMP_REGEX='^.*\.(so|dylib|bundle)(\.[0-9]+){0,2}$'
-			if [[ "${entry}" =~ ${TMP_REGEX} ]]; then
+			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
 				# 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