Changeset 448 for trunk/tools


Ignore:
Timestamp:
Mar 20, 2006, 10:24:29 PM (14 years ago)
Author:
bcornec
Message:

merge -r435:447 $SVN_M/branches/stable

Location:
trunk/tools
Files:
4 edited
1 copied

Legend:

Unmodified
Added
Removed
  • trunk/tools/livwww

    r422 r448  
    9999        DESTDIR=$MONDODIR
    100100    fi
     101    echo "Delivering to $DESTDIR on ${DESTMACH}"
    101102fi
    102103tar cfz /tmp/mondo-www.tgz .
    103 ssh ${DESTUSER}@${DESTMACH} "rm -rf ${DESTDIR} ; mkdir ${DESTDIR}"
    104104scp /tmp/mondo-www.tgz ${DESTUSER}@${DESTMACH}:/tmp
    105105rm -f /tmp/mondo-www.tgz
    106 ssh ${DESTUSER}@${DESTMACH} "cd ${DESTDIR} ; tar xfz /tmp/mondo-www.tgz"
     106ssh ${DESTUSER}@${DESTMACH} "rm -rf ${DESTDIR} ; mkdir ${DESTDIR} ; cd ${DESTDIR} ; tar xfz /tmp/mondo-www.tgz"
  • trunk/tools/mkdeliv

    r404 r448  
    88# BerliOS FTP/SSH setup
    99ACCOUNT=bruno@ftp.mondorescue.org
    10 DSTDIR=/
     10DSTDIR=/mondo/ftp
    1111FTPSERV="ftp.berlios.de"
    1212FTPDIR="/incoming"
  • trunk/tools/mkspec

    r394 r448  
    1212if [ -f ${dir}/../$ddir/spec.m4 ]; then
    1313    inc=${dir}/../$ddir/spec.m4
    14 elif [ -f ${dir}/../$ddmir/spec.m4 ]; then
    15     inc=${dir}/../$ddmir/spec.m4
     14elif [ -f ${dir}/../$dfam/spec.m4 ]; then
     15    inc=${dir}/../$dfam/spec.m4
    1616else
    1717    echo "Unable to build RPM for this distro. Please report to authors"
  • trunk/tools/rpm-env

    r394 r448  
    5757        export ddir="redhat"
    5858        dver=`awk '{print $5}' /etc/redhat-release`
     59        export dver=`echo ${dver} | sed "s/\.//"`
    5960        export suf=".rh${dver}"
    60         export dver=`echo ${dver} | sed "s/\.//"`
    6161    fi
    6262elif [ -e /etc/SuSE-release ]; then
Note: See TracChangeset for help on using the changeset viewer.