Changeset 932 in MondoRescue for trunk/tools/pkg2ftp


Ignore:
Timestamp:
Nov 15, 2006, 12:40:15 PM (13 years ago)
Author:
Bruno Cornec
Message:

merge -r913:931 $SVN_M/branches/stable

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/tools/pkg2ftp

    r839 r932  
    3737        c="mindi-kernel mondo-doc mindi mindi-busybox mondo"
    3838    else
    39         c=$1
     39        c="$*"
    4040    fi
    4141fi
     
    5252    src=${TOPDIR}/${VER}-$TAG/$p-[1-9st]*.tar.gz
    5353    pv=`basename $src .tar.gz`
     54    tag=`echo $pv | sed "s/-\([0-9]*.*\)/\2/"`
    5455    if [  _"$dtype" = _"rpm" ]; then
    5556        if [ _"$p" = _"mondo-doc" ]; then
     
    5859            ar=$ARCH
    5960        fi
    60         pkg="$pkg ${TOPBUILDDIR}/RPMS/${ar}/$pv-${TAG}${suf}.${ar}.rpm"
    61         spkg="$spkg ${TOPBUILDDIR}/SRPMS/$pv-${TAG}${suf}.src.rpm"
     61        pkg="$pkg ${TOPBUILDDIR}/RPMS/${ar}/$pv-${tag}${suf}.${ar}.rpm"
     62        spkg="$spkg ${TOPBUILDDIR}/SRPMS/$pv-${tag}${suf}.src.rpm"
    6263    elif [  _"$dtype" = "_deb" ]; then
    6364        pkg="$pkg ${TOPBUILDDIR}/$p_*.deb"
Note: See TracChangeset for help on using the changeset viewer.