From: Stephan Witt <switt@lyx.org>
Date: Thu, 6 Feb 2020 21:15:08 +0000 (+0100)
Subject: Enhanced version string extraction for 3rd party libraries.
X-Git-Tag: 2.3.6~99
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=3b65a4056ecab54c5cd50e6164d1758ffb49bd44;p=features.git

Enhanced version string extraction for 3rd party libraries.

(cherry picked from commit 6b48c45c5447f4851311e6012ba60effc5edb43a)
---

diff --git a/development/LyX-Mac-binary-release.sh b/development/LyX-Mac-binary-release.sh
index 023b272cc0..e29a5754e8 100644
--- a/development/LyX-Mac-binary-release.sh
+++ b/development/LyX-Mac-binary-release.sh
@@ -442,7 +442,7 @@ if [ -d "${LibMagicSourceDir}" -a ! -f "${LibMagicInstallHdr}" ]; then
 	# we have a private libmagic (file(1)) source tree at hand...
 	# so let's build and install it
 	if [ -z "${LibMagicVersion}" ]; then
-		LibMagicVersion=$(grep AC_INIT "${LibMagicSourceDir}"/configure.ac | cut -d, -f2|tr -d " ()")
+		LibMagicVersion=$(grep AC_INIT "${LibMagicSourceDir}"/configure.ac | cut -d, -f2|tr -d " []()")
 	fi
 
 	LibMagicName="LibMagic"
@@ -503,7 +503,7 @@ if [ -d "${HunSpellSourceDir}" -a ! -f "${HunSpellInstallHdr}" ]; then
 	# we have a private HunSpell source tree at hand...
 	# so let's build and install it
 	if [ -z "${HunSpellVersion}" ]; then
-		HunSpellVersion=$(grep AC_INIT "${HunSpellSourceDir}"/configure.ac | cut -d, -f2|tr -d " ()")
+		HunSpellVersion=$(grep AC_INIT "${HunSpellSourceDir}"/configure.ac | cut -d, -f2|tr -d " []()")
 	fi
 
 	HunSpellName="Hunspell"
@@ -565,7 +565,7 @@ if [ -d "${ASpellSourceDir}" -a ! -f "${ASpellInstallHdr}" -a "yes" = "${aspell_
 	# we have a private ASpell source tree at hand...
 	# so let's build and install it
 	if [ -z "${ASpellVersion}" ]; then
-		ASpellVersion=$(grep AC_INIT "${ASpellSourceDir}"/configure.ac | cut -d, -f2|tr -d " ()")
+		ASpellVersion=$(grep AC_INIT "${ASpellSourceDir}"/configure.ac | cut -d, -f2|tr -d " []()")
 	fi
 
 	ASpellName="Aspell"