Changeset 276 for trunk/tools


Ignore:
Timestamp:
Jan 3, 2006, 5:01:12 PM (14 years ago)
Author:
bcornec
Message:

merge -r274:275 $SVN_M/branches/2.06

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/tools/rpm-env

    r262 r276  
    3535if [ -e /etc/mandriva-release ]; then
    3636    export ddir="mandriva"
    37     export dver=`cat /etc/mandriva-release | awk '{print $4}'`
     37    export dver=`awk '{print $4}' /etc/mandriva-release`
    3838    export suf="${dver}mdk"
    3939elif [ -e /etc/mandrake-release ]; then
    4040    export ddir="mandrake"
    41     export dver=`cat /etc/mandrake-release | awk '{print $3}'`
     41    export dver=`awk '{print $3}' /etc/mandrake-release`
    4242    export suf="${dver}mdk"
    4343elif [ -e /etc/redhat-release ]; then
     
    4545    if [ $? -eq 0 ]; then
    4646        export ddir="rhel"
    47         export dver=`cat /etc/redhat-release | awk '{print $7}'`
     47        export dver=`awk '{print $7}' /etc/redhat-release`
    4848    elif grep -q Fedora /etc/redhat-release ; then
    4949        export ddir="fedora"
    50         export dver=`cat /etc/redhat-release | awk '{print $4}'`
     50        export dver=`awk '{print $4}' /etc/redhat-release`
    5151        export suf="fc${dver}"
    5252    else
    5353        export ddir="redhat"
    54         export dver=`cat /etc/redhat-release | awk '{print $5}' | sed "s/\.//"`
     54        export dver=`awk '{print $5}' /etc/redhat-release | sed "s/\.//"`
    5555        export suf="rh${dver}"
    5656    fi
     
    5959    if [ $? -eq 0 ]; then
    6060        export ddir="sles"
    61         export dver=`cat /etc/SuSE-release | head -1 | awk '{print $5}'`
     61        export dver=`head -1 /etc/SuSE-release | awk '{print $5}'`
    6262    else
    6363        export ddir="suse"
    64         export dver=`cat /etc/SuSE-release | head -1 | awk '{print $3}'`
     64        export dver=`head -1 /etc/SuSE-release | awk '{print $3}'`
    6565    fi
    6666else
Note: See TracChangeset for help on using the changeset viewer.