Skip to content

Commit 2815328

Browse files
committed
auto merge of #5540 : dbaupp/rust/configure-pandoc-version, r=brson
The version recognition was failing for pandoc version 1.11, thinking the minor version was 1 rather than 11, and thus not building the documentation.
2 parents dfedcc3 + 218093d commit 2815328

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

Diff for: configure

+7-6
Original file line numberDiff line numberDiff line change
@@ -444,12 +444,13 @@ fi
444444

445445
if [ ! -z "$CFG_PANDOC" ]
446446
then
447-
PANDOC_VER_LINE=$(pandoc --version | grep '^pandoc ')
448-
PANDOC_VER=${PANDOC_VER_LINE#pandoc }
449-
PV_MAJOR_MINOR=${PANDOC_VER%.[0-9]*}
450-
PV_MAJOR=${PV_MAJOR_MINOR%%[.][0-9]*}
451-
PV_MINOR=${PV_MAJOR_MINOR#[0-9]*[.]}
452-
PV_MINOR=${PV_MINOR%%[.][0-9]*}
447+
PV_MAJOR_MINOR=$(pandoc --version | grep '^pandoc ' |
448+
# extract the first 2 version fields, ignore everything else
449+
sed 's/pandoc \([0-9]*\)\.\([0-9]*\).*/\1 \2/')
450+
451+
# these patterns are shell globs, *not* regexps
452+
PV_MAJOR=${PV_MAJOR_MINOR% *}
453+
PV_MINOR=${PV_MAJOR_MINOR#* }
453454
if [ "$PV_MAJOR" -lt "1" ] || [ "$PV_MINOR" -lt "8" ]
454455
then
455456
step_msg "pandoc $PV_MAJOR.$PV_MINOR is too old. disabling"

0 commit comments

Comments
 (0)