Changeset 932 in MondoRescue for trunk/tools/distro-env

Timestamp:

Nov 15, 2006, 12:40:15 PM (17 years ago)

Author:

Bruno Cornec

Message:

merge -r913:931 $SVN_M/branches/stable

File:

• trunk/tools/distro-env (modified) (4 diffs)

trunk/tools/distro-env

@@ -27 +27 @@
             export ddir="fedora"
             export dver=`awk '{print $4}' /etc/redhat-release`
+        elif grep -q CentOS /etc/redhat-release ; then
+            export ddir="centos"
+            export dver=`awk '{print $3}' /etc/redhat-release`
         else
             export ddir="redhat"
@@ -81 +84 @@
     dtype="rpm"
     suf=".${ddir}${dver}"
-elif [ $ddir = "fedora" -o $ddir = "redhat" -o $ddir = "rhel" ]; then
+elif [ $ddir = "fedora" -o $ddir = "redhat" -o $ddir = "rhel" -o $ddir = "centos" ]; then
     dfam="redhat"
     dtype="rpm"
@@ -87 +90 @@
     if [ $ddir = "fedora" ]; then
         suf=".fc${dver1}"
+    elif [ $ddir = "centos" ]; then
+        dver1=`echo ${dver} | sed "s/\.[0-9]//"`
+        suf=".centos${dver1}"
     elif [ $ddir = "redhat" ]; then
         suf=".rh${dver1}"
@@ -118 +124 @@
 
 if [ _"$dtype" = _"rpm" ]; then
+    export TOPBUILDDIR=`rpmquery -E '%{_topdir}' 2> /dev/null`
     export ARCH=`rpm --showrc | egrep "^build arch" | awk '{print $4}'`
-    if [ -f ${HOME}/.rpmmacros ]; then
-        export TOPBUILDDIR=`egrep '^%_topdir' ${HOME}/.rpmmacros | awk '{print $2}'`
+    mkdir -p ${TOPBUILDDIR}/{RPMS,SRPMS,SPECS,SOURCES,BUILD}
+    if [ $? -ne 0 ]; then
+        echo "Please ensure that you can write into ${TOPBUILDDIR}"
+        echo "Solution: setup _topdir in your ~/.rpmmacros or"
+        echo "chown the ${TOPBUILDDIR} to your uid"
+        exit -1
     fi
-    mkdir -p ${TOPBUILDDIR}/{RPMS,SRPMS,SPECS,SOURCES,BUILD}
 elif [ _"$dtype" = _"deb" ]; then
     mkdir -p ${TOPBUILDDIR}