Changeset 1043 in MondoRescue for trunk/tools/pkg2ftp


Ignore:
Timestamp:
Jan 8, 2007, 11:31:22 PM (14 years ago)
Author:
Bruno Cornec
Message:

merge -r978:1042 $SVN_M/branches/stable

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/tools/pkg2ftp

    r932 r1043  
    1010dname=`dirname $0`
    1111prem=`echo $dname |cut -c1`
    12 if [ ${prem} == "/" ]; then
     12if [ _${prem} = _"/" ]; then
    1313        export TOOLHOME=$dname
    1414else
     
    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/"`
     54    tar -xz -C $MONDOTMP -f $src $pv/TAG
     55    tag=`cat $MONDOTMP/$pv/TAG`
    5556    if [  _"$dtype" = _"rpm" ]; then
    5657        if [ _"$p" = _"mondo-doc" ]; then
     
    6768        spkg="$spkg ${TOPBUILDDIR}/portage/sys-apps/$p/$pv.ebuild"
    6869        pkg="$pkg /usr/portage/packages/All/$pv.tbz2"
     70    elif [  _"$dfam" = _"slackware" ]; then
     71        pkg="$pkg ${TOPBUILDDIR}/build-$p/$pv-*-${tag}mr.tgz"
    6972    fi
    7073done
    7174
     75rm -rf $MONDOTMP
    7276echo "Packages delivery to ${ACCOUNT}:${DSTDIR}/${ddir}/${dver}"
    73 ssh ${ACCOUNT} "mkdir -p ${DSTDIR}/${ddir}/${dver}"
     77ssh -q ${ACCOUNT} "mkdir -p ${DSTDIR}/${ddir}/${dver} ; cd ${DSTDIR}/${ddir}/${dver} ; rm -f ${pkg} ${spkg}"
    7478scp ${pkg} ${spkg} ${ACCOUNT}:${DSTDIR}/${ddir}/${dver}
    7579) 2>&1 | tee /tmp/pkg2ftp.log
Note: See TracChangeset for help on using the changeset viewer.