Changeset 262 for trunk/tools


Ignore:
Timestamp:
Dec 23, 2005, 5:25:52 PM (14 years ago)
Author:
bcornec
Message:

merge -r253:261 $SVN_M/branches/2.05

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/tools/rpm-env

    r238 r262  
    4646        export ddir="rhel"
    4747        export dver=`cat /etc/redhat-release | awk '{print $7}'`
     48    elif grep -q Fedora /etc/redhat-release ; then
     49        export ddir="fedora"
     50        export dver=`cat /etc/redhat-release | awk '{print $4}'`
     51        export suf="fc${dver}"
    4852    else
    4953        export ddir="redhat"
    50         export dver=`cat /etc/redhat-release | awk '{print $5}'`
    51         export suf="${dver}rh"
     54        export dver=`cat /etc/redhat-release | awk '{print $5}' | sed "s/\.//"`
     55        export suf="rh${dver}"
    5256    fi
    5357elif [ -e /etc/SuSE-release ]; then
Note: See TracChangeset for help on using the changeset viewer.