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

Timestamp:

Jan 8, 2007, 11:31:22 PM (18 years ago)

Author:

Bruno Cornec

Message:

merge -r978:1042 $SVN_M/branches/stable

File:

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

trunk/tools/distro-env

@@ -39 +39 @@
             export ddir="sles"
             export dver=`head -1 /etc/SuSE-release | awk '{print $5}'`
+        elif grep -q openSUSE /etc/SuSE-release ; then
+            export ddir="suse"
+            export dver=`head -1 /etc/SuSE-release | awk '{print $2}'`
         else
             export ddir="suse"
             export dver=`head -1 /etc/SuSE-release | awk '{print $3}'`
         fi
+    elif [ -e /etc/slackware-version ]; then
+        export ddir="slackware"
+        export dver=`awk '{print $2}' /etc/slackware-version | cut -d. -f1-2`
     elif [ -e /etc/gentoo-release ]; then
         export ddir="gentoo"
@@ -57 +63 @@
         if [ $dver = "testing/unstable" ]; then
             export dver = "sid"
+        fi
+    elif [ -e /etc/motd ]; then
+        head -1 /etc/motd | grep -q FreeBSD
+        if [ $? -eq 0 ]; then
+            export ddir="freebsd"
+            export dver=`head -1 /etc/motd | awk '{print $2}' /etc/motd | cut -d- -f1`
+        else
+            export ddir="unknown"
+            export dver=""
         fi
     else
@@ -77 +92 @@
     suf=".${ddir}${dver1}"
 elif [ $ddir = "slackware" ]; then
-    dfam="slack"
+    dfam="slackware"
     dtype="tgz"
     suf=".${dfam}${dver}"
@@ -106 +121 @@
     dtype="rpm"
     suf=".`echo $dver | sed 's/\.//'`mdv"
+elif [ $ddir = "freebsd" ]; then
+    dfam="freebsd"
+    dtype="port"
+    suf=".`echo $dver | sed 's/\.//'`fbsd"
 else
     dfam="unknown"
@@ -124 +143 @@
 
 if [ _"$dtype" = _"rpm" ]; then
-    export TOPBUILDDIR=`rpmquery -E '%{_topdir}' 2> /dev/null`
+    export TOPBUILDDIR=`rpmquery --eval '%{_topdir}' 2> /dev/null`
     export ARCH=`rpm --showrc | egrep "^build arch" | awk '{print $4}'`
     mkdir -p ${TOPBUILDDIR}/{RPMS,SRPMS,SPECS,SOURCES,BUILD}
@@ -135 +154 @@
 elif [ _"$dtype" = _"deb" ]; then
     mkdir -p ${TOPBUILDDIR}
+elif [ _"$dtype" = _"port" ]; then
+    mkdir -p ${TOPBUILDDIR}
+elif [ _"$dfam" = _"slackware" ]; then
+    mkdir -p ${TOPBUILDDIR}/install
 elif [ _"$dtype" = _"ebuild" ]; then
     mkdir -p ${TOPBUILDDIR}/portage