Skip to content

Commit 63ca141

Browse files
committed
---
yaml --- r: 33395 b: refs/heads/snap-stage3 c: 33795bc h: refs/heads/master i: 33393: f683b69 33391: 5a613ef v: v3
1 parent fb45b0b commit 63ca141

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: acf2d208d617d88b91c3d3282bf3e5e1a9a51c10
4+
refs/heads/snap-stage3: 33795bc4d39227818f1ea849bee50216235e8a0f
55
refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/configure

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -362,11 +362,15 @@ fi
362362

363363
if [ ! -z "$CFG_PANDOC" ]
364364
then
365-
read PV_MAJOR PV_MINOR <<<$(pandoc --version | awk '/^pandoc/ {split($2, PV, "."); print PV[1] " " PV[2]}')
365+
PANDOC_VER_LINE=$(pandoc --version | grep '^pandoc ')
366+
PANDOC_VER=${PANDOC_VER_LINE#pandoc }
367+
PV_MAJOR_MINOR=${PANDOC_VER%.[0-9]}
368+
PV_MAJOR=${PV_MAJOR_MINOR%.[0-9]}
369+
PV_MINOR=${PV_MAJOR_MINOR#[0-9].}
366370
if [ "$PV_MAJOR" -lt "1" ] || [ "$PV_MINOR" -lt "8" ]
367371
then
368-
step_msg "pandoc $PV_MAJOR.$PV_MINOR is too old. disabling"
369-
BAD_PANDOC=1
372+
step_msg "pandoc $PV_MAJOR.$PV_MINOR is too old. disabling"
373+
BAD_PANDOC=1
370374
fi
371375
fi
372376

0 commit comments

Comments
 (0)