about summary refs log tree commit diff
diff options
context:
space:
mode:
authorChris Wong <lambda.fairy@gmail.com>2015-05-08 22:35:40 +1200
committerChris Wong <lambda.fairy@gmail.com>2015-05-08 22:52:02 +1200
commit939c53ea42bc677dbce9755a77bd55a5d47f8185 (patch)
tree7d789be222ccbe86b31e2579095f23fde5d5fd45
parent535040aab88508e4c43b7d29a96ea74aa5d0883a (diff)
configure: display correct version for md5sum
The old code simply scanned for the first digit, then munched anything
after that. This didn't work for md5sum, as it would see the "5" and
treat "5sum" as the version instead.

This patch tweaks the algorithm so that it looks for a second
consecutive digit (or dot) after the first. Since "md5sum" has only one
digit, the new code skips over it as intended.
-rwxr-xr-xconfigure4
1 files changed, 2 insertions, 2 deletions
diff --git a/configure b/configure
index 814626481f5..50d24c1bec9 100755
--- a/configure
+++ b/configure
@@ -104,8 +104,8 @@ probe() {
         T=$(command -v $P 2>&1)
         if [ $? -eq 0 ]
         then
-            VER0=$($P --version 2>/dev/null | head -1 \
-                |  sed -e 's/[^0-9]*\([vV]\?[0-9.]\+[^ ]*\).*/\1/' )
+            VER0=$($P --version 2>/dev/null \
+                |  grep -o '[vV]\?[0-9][0-9.][a-z0-9.-]*' | head -1 )
             if [ $? -eq 0 -a "x${VER0}" != "x" ]
             then
               VER="($VER0)"