]> git.lizzy.rs Git - rust.git/commitdiff
configure: fix use of bash-specific here strings (also awk, please no more deps).
authorGraydon Hoare <graydon@mozilla.com>
Thu, 18 Oct 2012 20:04:52 +0000 (13:04 -0700)
committerGraydon Hoare <graydon@mozilla.com>
Thu, 18 Oct 2012 21:51:20 +0000 (14:51 -0700)
configure

index cd500b6ec43a1cfb39102c247192396b554c39f6..3ff72afe67f84850fbe8e9a09960135f52767863 100755 (executable)
--- a/configure
+++ b/configure
@@ -362,11 +362,15 @@ fi
 
 if [ ! -z "$CFG_PANDOC" ]
 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" ]
     then
-       step_msg "pandoc $PV_MAJOR.$PV_MINOR is too old. disabling"
-       BAD_PANDOC=1
+               step_msg "pandoc $PV_MAJOR.$PV_MINOR is too old. disabling"
+               BAD_PANDOC=1
     fi
 fi