Skip to content

Commit

Permalink
configure: simplify pandoc version recognition.
Browse files Browse the repository at this point in the history
The version recognition was failing for version 1.11, thinking the
minor version was 1 rather than 11.
  • Loading branch information
huonw committed Mar 25, 2013
1 parent a56ec8c commit 218093d
Showing 1 changed file with 7 additions and 6 deletions.
13 changes: 7 additions & 6 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -406,12 +406,13 @@ fi

if [ ! -z "$CFG_PANDOC" ]
then
PANDOC_VER_LINE=$(pandoc --version | grep '^pandoc ')
PANDOC_VER=${PANDOC_VER_LINE#pandoc }
PV_MAJOR_MINOR=${PANDOC_VER%.[0-9]*}
PV_MAJOR=${PV_MAJOR_MINOR%%[.][0-9]*}
PV_MINOR=${PV_MAJOR_MINOR#[0-9]*[.]}
PV_MINOR=${PV_MINOR%%[.][0-9]*}
PV_MAJOR_MINOR=$(pandoc --version | grep '^pandoc ' |
# extract the first 2 version fields, ignore everything else
sed 's/pandoc \([0-9]*\)\.\([0-9]*\).*/\1 \2/')

# these patterns are shell globs, *not* regexps
PV_MAJOR=${PV_MAJOR_MINOR% *}
PV_MINOR=${PV_MAJOR_MINOR#* }
if [ "$PV_MAJOR" -lt "1" ] || [ "$PV_MINOR" -lt "8" ]
then
step_msg "pandoc $PV_MAJOR.$PV_MINOR is too old. disabling"
Expand Down

0 comments on commit 218093d

Please sign in to comment.