update configure

[bacula/bacula] / regress / scripts / get-os

diff --git a/regress/scripts/get-os b/regress/scripts/get-os
index 64cb63cc1b5c7ffd3ce2191d8540243de5433636..b14b7880227ee2cd276768e8c1e16e766def806a 100755 (executable)
--- a/regress/scripts/get-os
+++ b/regress/scripts/get-os
@@ -1,5 +1,6 @@
 #!/bin/sh
 
+SHELL=${SHELL:-/bin/sh}
 ac_aux_dir=scripts
 
 # Make sure we can run config.sub.
@@ -384,11 +385,11 @@ then
        DISTNAME=redhat
 elif test -f /etc/redhat-release
 then
-       if test `grep CentOs /etc/redhat-release`
+       if grep -q CentOS /etc/redhat-release
        then
-           DISTNAME=redhat
-       else
            DISTNAME=centos
+       else
+           DISTNAME=redhat
        fi
 elif test -f /etc/gentoo-release
 then
@@ -434,6 +435,15 @@ debian)
         else
            DISTVER=`cat /etc/debian_version`
         fi
+        if test -f /etc/lsb-release ; then
+           . /etc/lsb-release
+           if test "x$DISTRIB_ID" != "x" ; then
+              DISTNAME=$DISTRIB_ID
+           fi
+           if test "x$DISTRIB_RELEASE" != "x" ; then
+              DISTVER=$DISTRIB_RELEASE
+           fi
+        fi
   ;;
 freebsd)
         DISTVER=`uname -a |awk '{print $3}'`
@@ -458,8 +468,7 @@ redhat)
         fi
         if test `cat $f | grep release |\
                    cut -f 3 -d ' '`x = "Enterprise"x ; then
-           DISTVER="Enterprise "`cat $f | grep release |\
-                    cut -f 6 -d ' '`
+           DISTVER="RHEL "`cat $f | grep release | cut -f 6 -d ' '`
         else
             DISTVER=`cat /etc/redhat-release | grep release |\
                      cut -f 5 -d ' '`
@@ -506,4 +515,4 @@ unknown)
 esac
 
 
-echo "${DISTNAME}-${DISTVER}"
+echo "${DISTNAME}-${DISTVER}" | sed -e 's,/,-,g'