File tree 1 file changed +5
-3
lines changed
1 file changed +5
-3
lines changed Original file line number Diff line number Diff line change @@ -693,15 +693,17 @@ probe CFG_ADB adb
693
693
694
694
if [ ! -z " $CFG_PANDOC " ]
695
695
then
696
- PV_MAJOR_MINOR=$( pandoc --version | grep ' ^pandoc\(.exe\)\? ' |
697
- # extract the first 2 version fields, ignore everything else
698
- sed ' s/pandoc\ (.exe\)\? \ ([0-9]*\ )\.\ ([0-9]*\ ).*/\2 \3/' )
696
+ PV_MAJOR_MINOR=$( pandoc --version | grep ' ^pandoc' |
697
+ # Extract "MAJOR MINOR" from Pandoc's version number
698
+ sed -E ' s/pandoc(.exe)? ([0-9]+ )\.([0-9]+ ).*/\2 \3/' )
699
699
700
700
MIN_PV_MAJOR=" 1"
701
701
MIN_PV_MINOR=" 9"
702
+
702
703
# these patterns are shell globs, *not* regexps
703
704
PV_MAJOR=${PV_MAJOR_MINOR% * }
704
705
PV_MINOR=${PV_MAJOR_MINOR#* }
706
+
705
707
if [ " $PV_MAJOR " -lt " $MIN_PV_MAJOR " ] || [ " $PV_MINOR " -lt " $MIN_PV_MINOR " ]
706
708
then
707
709
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