Changeset 98 in MondoRescue for trunk/tools

Timestamp:

Nov 4, 2005, 11:55:39 PM (18 years ago)

Author:

bcornec

Message:

merge -r 96:97 from 2.04 branch

Location:

trunk/tools

Files:

• mkdeliv (modified) (1 diff)
• rpm-env (modified) (1 diff)

trunk/tools/mkdeliv

@@ -46 +46 @@
 scp ${rpms} ${SVNAUTH}:${DSTDIR}/${ddir}/${dver}
 scp ${srpms} ${SVNAUTH}:${DSTDIR}/${ddir}/${dver}
-echo "Sources delivery to ${FTPURL}"
-ncftpput ${FTPURL} ${tgz}
+echo "Sources delivery to ${FTPSERV} ${FTPDIR}"
+if [ "`which ncftpput`" != "" ]; then
+    ncftpput ${FTPSERV} ${FTPDIR} ${tgz}
+elif [ "`which lftp`" != "" ]; then
+    lftp -e "cd ${FTPDIR} ; put ${tgz} ; quit" ${FTPSERV}
+fi

trunk/tools/rpm-env

@@ -10 +10 @@
 export SVNAUTH=bcornec@shell.berlios.de
 export DSTDIR=/home/groups/ftp/pub/mondorescue
-export FTPURL="ftp.berlios.de /incoming"
+export FTPSERV="ftp.berlios.de"
+export FTPDIR="/incoming"
 
 # Should not be modified below