Changeset 97 in MondoRescue

Timestamp:

Nov 4, 2005, 11:51:13 PM (20 years ago)

Author:

bcornec

Message:

Patch from Sébastien Aperghis-Tramoni <maddingue_AT_free.fr> to suppress some warnings issued by mindi

Location:

branches/2.04_berlios

Files:

• mindi/analyze-my-lvm (modified) (3 diffs)
• mindi/mindi (modified) (3 diffs)
• tools/mkdeliv (modified) (1 diff)
• tools/rpm-env (modified) (1 diff)

branches/2.04_berlios/mindi/analyze-my-lvm

@@ -243 +243 @@
 
 # -------------------------------- main -----------------------------------
-which lvmdiskscan >/dev/null 2>&1 || Die "Cannot find lvmdiskscan. Are you sure you're using LVM?"
+which lvmdiskscan 2>/dev/null 2>&1 || Die "Cannot find lvmdiskscan. Are you sure you're using LVM?"
 if [ -e "/proc/lvm/global" ] && [ "`cat /proc/lvm/global | tr -s '\t' ' ' | grep "0 VGs 0 PVs 0 LVs"`" != "" ] ; then
     exit 0
@@ -253 +253 @@
 #lvmversion=`lvmdiskscan --version | grep "LVM version:" | cut -d: -f2 | cut -d. -f1 | sed -e 's/ //g'`
 
-lvmversion=`lvmdiskscan --version |
+lvmversion=`lvmdiskscan --help |
   grep -E "Logical Volume Manager|LVM version:" |
   cut -d: -f2 | cut -d. -f1 |
@@ -259 +259 @@
   sed -e 's/ //g'`
 
-if which lvm; then
+if which lvm 2>/dev/null; then
     version=`lvm version | grep "LVM version" | awk '{print $3}'`
     i="`echo "$version" | cut -d'.' -f1`"

branches/2.04_berlios/mindi/mindi

@@ -117 +117 @@
     which strings > /dev/null 2> /dev/null || Die "Please install binutils and libbinutils; you have no 'strings' executable."
     which gawk > /dev/null 2> /dev/null || Die "Gawk is missing from your computer. Please install gawk. You may find the package on Debian's website. How did I know you're running Debian? Because only Debian would be stupid enough not to include gawk in your distribution."
-    which gawk > /dev/null 2> /dev/null && AWK=`which gawk` ||AWK="`which awk`"
+    which gawk > /dev/null 2> /dev/null && AWK=`which gawk 2>/dev/null` || AWK="`which awk 2>/dev/null`"
     if which awk &> /dev/null ; then
     if ! which gawk &> /dev/null ; then
@@ -296 +296 @@
     copy_to=$1
     copy_from=/boot/boot.b
-    liloc=`which lilo.real`
-    [ $liloc ] || liloc=`which lilo`
+    liloc=`which lilo.real 2>/dev/null`
+    [ $liloc ] || liloc=`which lilo 2>/dev/null`
     if [ $liloc ]; then
         if ! [ `strings $liloc | grep "boot\.b"` ]; then
@@ -936 +936 @@
 GetHomeDir() {
     local res loc
-    loc=`which $1`
+    loc=`which $1 2>/dev/null`
     res=`file $loc | $AWK '{print $NF;}'`
     dirname $res

branches/2.04_berlios/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

branches/2.04_berlios/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