Changeset 98


Ignore:
Timestamp:
Nov 4, 2005, 11:55:39 PM (13 years ago)
Author:
bcornec
Message:

merge -r 96:97 from 2.04 branch

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/mindi/analyze-my-lvm

    r30 r98  
    243243
    244244# -------------------------------- main -----------------------------------
    245 which lvmdiskscan >/dev/null 2>&1 || Die "Cannot find lvmdiskscan. Are you sure you're using LVM?"
     245which lvmdiskscan 2>/dev/null 2>&1 || Die "Cannot find lvmdiskscan. Are you sure you're using LVM?"
    246246if [ -e "/proc/lvm/global" ] && [ "`cat /proc/lvm/global | tr -s '\t' ' ' | grep "0 VGs 0 PVs 0 LVs"`" != "" ] ; then
    247247    exit 0
     
    253253#lvmversion=`lvmdiskscan --version | grep "LVM version:" | cut -d: -f2 | cut -d. -f1 | sed -e 's/ //g'`
    254254
    255 lvmversion=`lvmdiskscan --version |
     255lvmversion=`lvmdiskscan --help |
    256256  grep -E "Logical Volume Manager|LVM version:" |
    257257  cut -d: -f2 | cut -d. -f1 |
     
    259259  sed -e 's/ //g'`
    260260
    261 if which lvm; then
     261if which lvm 2>/dev/null; then
    262262    version=`lvm version | grep "LVM version" | awk '{print $3}'`
    263263    i="`echo "$version" | cut -d'.' -f1`"
  • trunk/mindi/mindi

    r78 r98  
    117117    which strings > /dev/null 2> /dev/null || Die "Please install binutils and libbinutils; you have no 'strings' executable."
    118118    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."
    119     which gawk > /dev/null 2> /dev/null && AWK=`which gawk` ||AWK="`which awk`"
     119    which gawk > /dev/null 2> /dev/null && AWK=`which gawk 2>/dev/null` || AWK="`which awk 2>/dev/null`"
    120120    if which awk &> /dev/null ; then
    121121    if ! which gawk &> /dev/null ; then
     
    296296    copy_to=$1
    297297    copy_from=/boot/boot.b
    298     liloc=`which lilo.real`
    299     [ $liloc ] || liloc=`which lilo`
     298    liloc=`which lilo.real 2>/dev/null`
     299    [ $liloc ] || liloc=`which lilo 2>/dev/null`
    300300    if [ $liloc ]; then
    301301        if ! [ `strings $liloc | grep "boot\.b"` ]; then
     
    936936GetHomeDir() {
    937937    local res loc
    938     loc=`which $1`
     938    loc=`which $1 2>/dev/null`
    939939    res=`file $loc | $AWK '{print $NF;}'`
    940940    dirname $res
  • trunk/tools/mkdeliv

    r93 r98  
    4646scp ${rpms} ${SVNAUTH}:${DSTDIR}/${ddir}/${dver}
    4747scp ${srpms} ${SVNAUTH}:${DSTDIR}/${ddir}/${dver}
    48 echo "Sources delivery to ${FTPURL}"
    49 ncftpput ${FTPURL} ${tgz}
     48echo "Sources delivery to ${FTPSERV} ${FTPDIR}"
     49if [ "`which ncftpput`" != "" ]; then
     50    ncftpput ${FTPSERV} ${FTPDIR} ${tgz}
     51elif [ "`which lftp`" != "" ]; then
     52    lftp -e "cd ${FTPDIR} ; put ${tgz} ; quit" ${FTPSERV}
     53fi
  • trunk/tools/rpm-env

    r66 r98  
    1010export SVNAUTH=bcornec@shell.berlios.de
    1111export DSTDIR=/home/groups/ftp/pub/mondorescue
    12 export FTPURL="ftp.berlios.de /incoming"
     12export FTPSERV="ftp.berlios.de"
     13export FTPDIR="/incoming"
    1314
    1415# Should not be modified below
Note: See TracChangeset for help on using the changeset viewer.