From: S.Çağlar Onur Date: Tue, 27 Apr 2010 20:30:06 +0000 (+0000) Subject: band aid for now X-Git-Tag: 5.0-rc8~48 X-Git-Url: http://git.onelab.eu/?p=build.git;a=commitdiff_plain;h=a1acbc0eda5e3b8fc20a8def8db4e083b90bdacb band aid for now --- diff --git a/build.common b/build.common index 172cee25..dc8bb386 100644 --- 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,7 +32,7 @@ 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=="Redhat") print $6 } ' /etc/redhat-release) else echo "build.common.pl_getRelease-unknown" exit 1 @@ -47,6 +50,9 @@ function pl_getReleaseName () { [Ff]edora*) releasename=f$release ;; + [Re]edhat*) + releasename=rhel6 + ;; [Cc]entOS*) old_IFS="$IFS" IFS="."