Changeset 448 in MondoRescue for trunk/tools

Timestamp:

Mar 20, 2006, 10:24:29 PM (19 years ago)

Author:

bcornec

Message:

merge -r435:447 $SVN_M/branches/stable

Location:

trunk/tools

Files:

• livwww (modified) (1 diff)
• mkdeliv (modified) (1 diff)
• mkqemu (copied) (copied from branches/stable/tools/mkqemu )
• mkspec (modified) (1 diff)
• rpm-env (modified) (1 diff)

trunk/tools/livwww

@@ -99 +99 @@
         DESTDIR=$MONDODIR
     fi
+    echo "Delivering to $DESTDIR on ${DESTMACH}"
 fi
 tar cfz /tmp/mondo-www.tgz .
-ssh ${DESTUSER}@${DESTMACH} "rm -rf ${DESTDIR} ; mkdir ${DESTDIR}"
 scp /tmp/mondo-www.tgz ${DESTUSER}@${DESTMACH}:/tmp
 rm -f /tmp/mondo-www.tgz
-ssh ${DESTUSER}@${DESTMACH} "cd ${DESTDIR} ; tar xfz /tmp/mondo-www.tgz"
+ssh ${DESTUSER}@${DESTMACH} "rm -rf ${DESTDIR} ; mkdir ${DESTDIR} ; cd ${DESTDIR} ; tar xfz /tmp/mondo-www.tgz"

trunk/tools/mkdeliv

@@ -8 +8 @@
 # BerliOS FTP/SSH setup
 ACCOUNT=bruno@ftp.mondorescue.org
-DSTDIR=/
+DSTDIR=/mondo/ftp
 FTPSERV="ftp.berlios.de"
 FTPDIR="/incoming"

trunk/tools/mkspec

@@ -12 +12 @@
 if [ -f ${dir}/../$ddir/spec.m4 ]; then 
     inc=${dir}/../$ddir/spec.m4
-elif [ -f ${dir}/../$ddmir/spec.m4 ]; then 
-    inc=${dir}/../$ddmir/spec.m4
+elif [ -f ${dir}/../$dfam/spec.m4 ]; then 
+    inc=${dir}/../$dfam/spec.m4
 else
     echo "Unable to build RPM for this distro. Please report to authors"

trunk/tools/rpm-env

@@ -57 +57 @@
         export ddir="redhat"
         dver=`awk '{print $5}' /etc/redhat-release`
+        export dver=`echo ${dver} | sed "s/\.//"`
         export suf=".rh${dver}"
-        export dver=`echo ${dver} | sed "s/\.//"`
     fi
 elif [ -e /etc/SuSE-release ]; then