File tree Expand file tree Collapse file tree 2 files changed +6
-4
lines changed Expand file tree Collapse file tree 2 files changed +6
-4
lines changed Original file line number Diff line number Diff line change 1
1
---
2
2
refs/heads/master: 4d716decb5d9944bc0d79cdc51b03e3af69bc59c
3
3
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4
- refs/heads/snap-stage3: 61c6b199bcc23fe931f3fda2f968442256e07dab
4
+ refs/heads/snap-stage3: 7ed4660a51b048f8b166b298d1777544d3a0fd98
5
5
refs/heads/try: 649d35e4d830b27806705dc5352c86ab6d6fd1a1
6
6
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
7
7
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
Original file line number Diff line number Diff line change @@ -697,15 +697,17 @@ probe CFG_ADB adb
697
697
698
698
if [ ! -z " $CFG_PANDOC " ]
699
699
then
700
- PV_MAJOR_MINOR=$( pandoc --version | grep ' ^pandoc\(.exe\)\? ' |
701
- # extract the first 2 version fields, ignore everything else
702
- sed ' s/pandoc\ (.exe\)\? \ ([0-9]*\ )\.\ ([0-9]*\ ).*/\2 \3/' )
700
+ PV_MAJOR_MINOR=$( pandoc --version | grep ' ^pandoc' |
701
+ # Extract "MAJOR MINOR" from Pandoc's version number
702
+ sed -E ' s/pandoc(.exe)? ([0-9]+ )\.([0-9]+ ).*/\2 \3/' )
703
703
704
704
MIN_PV_MAJOR=" 1"
705
705
MIN_PV_MINOR=" 9"
706
+
706
707
# these patterns are shell globs, *not* regexps
707
708
PV_MAJOR=${PV_MAJOR_MINOR% * }
708
709
PV_MINOR=${PV_MAJOR_MINOR#* }
710
+
709
711
if [ " $PV_MAJOR " -lt " $MIN_PV_MAJOR " ] || [ " $PV_MINOR " -lt " $MIN_PV_MINOR " ]
710
712
then
711
713
step_msg " pandoc $PV_MAJOR .$PV_MINOR is too old. Need at least $MIN_PV_MAJOR .$MIN_PV_MINOR . Disabling"
You can’t perform that action at this time.
0 commit comments