File tree Expand file tree Collapse file tree 1 file changed +7
-6
lines changed Expand file tree Collapse file tree 1 file changed +7
-6
lines changed Original file line number Diff line number Diff line change 444
444
445
445
if [ ! -z " $CFG_PANDOC " ]
446
446
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#* }
453
454
if [ " $PV_MAJOR " -lt " 1" ] || [ " $PV_MINOR " -lt " 8" ]
454
455
then
455
456
step_msg " pandoc $PV_MAJOR .$PV_MINOR is too old. disabling"
You can’t perform that action at this time.
0 commit comments