dnrops
/
rust
mirror of https://github.com/rust-lang/rust.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

configure: fix use of bash-specific here strings (also awk, please no more deps).

This commit is contained in:
Graydon Hoare 2012-10-18 13:04:52 -07:00
parent acf2d208d6
commit 33795bc4d3
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configure vendored
View File

@ -362,11 +362,15 @@ fi
if [ ! -z "$CFG_PANDOC" ] if [ ! -z "$CFG_PANDOC" ]
then then
read PV_MAJOR PV_MINOR <<<$(pandoc --version | awk '/^pandoc/ {split($2, PV, "."); print PV[1] " " PV[2]}') PANDOC_VER_LINE=$(pandoc --version | grep '^pandoc ')
PANDOC_VER=${PANDOC_VER_LINE#pandoc }
PV_MAJOR_MINOR=${PANDOC_VER%.[0-9]}
PV_MAJOR=${PV_MAJOR_MINOR%.[0-9]}
PV_MINOR=${PV_MAJOR_MINOR#[0-9].}
if [ "$PV_MAJOR" -lt "1" ] || [ "$PV_MINOR" -lt "8" ] if [ "$PV_MAJOR" -lt "1" ] || [ "$PV_MINOR" -lt "8" ]
then then
step_msg "pandoc $PV_MAJOR.$PV_MINOR is too old. disabling" step_msg "pandoc $PV_MAJOR.$PV_MINOR is too old. disabling"
BAD_PANDOC=1 BAD_PANDOC=1
fi fi
fi fi