typo

[build.git] / build.common

diff --git a/build.common b/build.common
index 919106b..e179c1b 100644 (file)
--- a/build.common
+++ b/build.common
@@ -18,6 +18,9 @@ export PATH=.:$PATH
 function pl_getDistro() {
     if [ -f "/etc/redhat-release" ] ; then
        distro=$(awk ' { print $1 } ' /etc/redhat-release)
+       if [ $distro="Red" ] ; then
+               distro="Redhat"
+       fi
     else
        echo "build.common.pl_getDistro-unknown"
        exit 1
@@ -29,12 +32,13 @@ function pl_getDistro() {
 # returns something like 8, 10, or 5.3
 function pl_getRelease() {
     if [ -f "/etc/redhat-release" ] ; then
-       release=$(awk ' { if ($1=="Fedora" && $2=="Core") print $4 ; if (($1=="Fedora" && $2!="Core")||$1=="CentOS") print $3 } ' /etc/redhat-release)
+       release=$(awk ' { if ($1=="Fedora" && $2=="Core") print $4 ; if (($1=="Fedora" && $2!="Core")||$1=="CentOS") print $3 ; if ($1=="Red") print $6 } ' /etc/redhat-release)
     else
        echo "build.common.pl_getRelease-unknown"
        exit 1
     fi
-    echo "$release"
+    # keep only the major number
+    echo "$release" | cut -d. -f1
     return 0
 }
 
@@ -46,6 +50,9 @@ function pl_getReleaseName () {
        [Ff]edora*)
            releasename=f$release
            ;;
+       [Re]edhat*)
+           releasename=rhel6
+           ;;
        [Cc]entOS*)
            old_IFS="$IFS"
            IFS="."
@@ -730,6 +737,6 @@ function yumconf_exclude () {
     repo=$1; shift
     kexclude_line="$1" ; shift
     
-    sed -i -e "/baseurl=.*$/i\\
+    sed -i -e "/#baseurl=.*$/i\\
 $kexclude_line" $repo
 }