Changeset 276 in MondoRescue for trunk/tools

Timestamp:

Jan 3, 2006, 5:01:12 PM (18 years ago)

Author:

bcornec

Message:

merge -r274:275 $SVN_M/branches/2.06

File:

• trunk/tools/rpm-env (modified) (3 diffs)

trunk/tools/rpm-env

@@ -35 +35 @@
 if [ -e /etc/mandriva-release ]; then
     export ddir="mandriva"
-    export dver=`cat /etc/mandriva-release | awk '{print $4}'`
+    export dver=`awk '{print $4}' /etc/mandriva-release`
     export suf="${dver}mdk"
 elif [ -e /etc/mandrake-release ]; then
     export ddir="mandrake"
-    export dver=`cat /etc/mandrake-release | awk '{print $3}'`
+    export dver=`awk '{print $3}' /etc/mandrake-release`
     export suf="${dver}mdk"
 elif [ -e /etc/redhat-release ]; then
@@ -45 +45 @@
     if [ $? -eq 0 ]; then
         export ddir="rhel"
-        export dver=`cat /etc/redhat-release | awk '{print $7}'`
+        export dver=`awk '{print $7}' /etc/redhat-release`
     elif grep -q Fedora /etc/redhat-release ; then
         export ddir="fedora"
-        export dver=`cat /etc/redhat-release | awk '{print $4}'`
+        export dver=`awk '{print $4}' /etc/redhat-release`
         export suf="fc${dver}"
     else
         export ddir="redhat"
-        export dver=`cat /etc/redhat-release | awk '{print $5}' | sed "s/\.//"`
+        export dver=`awk '{print $5}' /etc/redhat-release | sed "s/\.//"`
         export suf="rh${dver}"
     fi
@@ -59 +59 @@
     if [ $? -eq 0 ]; then
         export ddir="sles"
-        export dver=`cat /etc/SuSE-release | head -1 | awk '{print $5}'`
+        export dver=`head -1 /etc/SuSE-release | awk '{print $5}'`
     else
         export ddir="suse"
-        export dver=`cat /etc/SuSE-release | head -1 | awk '{print $3}'`
+        export dver=`head -1 /etc/SuSE-release | awk '{print $3}'`
     fi
 else