fyb/calcurse-edge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Quick fix for "autogen.sh" version comparison breakage.

Browse Source 
The autogen script failed to compare program versions properly printing
error messages like "./autogen.sh: line 107: [: too many arguments" to
stderr. This commit adds a hacky fix. To fix this properly,
check_program_version() should be rewritten from scratch.

Signed-off-by: Lukas Fleischer <calcurse@cryptocrack.de>
This commit is contained in:
Lukas Fleischer 2011-03-03 15:19:55 +01:00
parent ea44597a5a
commit 012e446194
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
autogen.sh
View File

@ -97,14 +97,13 @@ check_program_version()
{
PROGRAM=$1; MAJOR=$2; MINOR=$3
printf "Checking that $PROGRAM version is at least $MAJOR.$MINOR ... "
VERSION=`$PROGRAM --version |head -n 1|sed 's/([^)]*)//g;s/^[a-zA-Z\.\ \
\-]*//;s/ .*$//'`
VERSION=`$PROGRAM --version | head -n 1 | rev | cut -d' ' -f1 | rev`
MAJOR_FOUND=`echo $VERSION | cut -d. -f1`
MINOR_FOUND=`echo $VERSION | sed s/[-,a-z,A-Z].*// | cut -d. -f2`
MINOR_FOUND=`echo $VERSION | sed 's/[a-zA-Z-].*//' | cut -d. -f2`
[ -z "$MINOR_FOUND" ] && MINOR_FOUND=0
WRONG=
if [ -z "$MAJOR_FOUND" -lt "$MAJOR" ]; then
if [ "$MAJOR_FOUND" -lt "$MAJOR" ]; then
WRONG=1
elif [ "$MAJOR_FOUND" -eq "$MAJOR" ]; then
if [ "$MINOR_FOUND" -lt "$MINOR" ]; then