Changeset 276 for trunk/mindi/mindi


Ignore:
Timestamp:
Jan 3, 2006, 5:01:12 PM (15 years ago)
Author:
bcornec
Message:

merge -r274:275 $SVN_M/branches/2.06

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/mindi/mindi

    r274 r276  
    808808    echo -en "$DONE\nMaking complete dependency list"
    809809
    810     cat $tempfile | tr -s '/' '/' | sort | uniq > $tempfile.new
     810    tr -s '/' '/' < $tempfile | sort | uniq > $tempfile.new
    811811    mv -f $tempfile.new $tempfile
    812812    > $outfile.pre
     
    863863    fi
    864864    fi
    865      cat $outfile.pre | tr ' ' '\n' | tr -s '/' '/' | fgrep -vx "" | sort -u | egrep -v "/libX11|/libXext|/libXi|/libgtk|/libgdk" > $outfile
     865     tr ' ' '\n' < $outfile.pre | tr -s '/' '/' | fgrep -vx "" | sort -u | egrep -v "/libX11|/libXext|/libXi|/libgtk|/libgdk" > $outfile
    866866    rm -f $tempfile $outfile.pre
    867867    [ "$res" -eq "0" ] && echo -e "\r\t\t\t\t\t\t\t\t$DONE" || echo "\nFailed."
     
    12461246    if [ $tmpmodprobe_flag == "Y" ] ; then
    12471247    infile="/tmp/modprobe.conf.mindi.$$"
    1248     cat `find /etc/modprobe.d -maxdepth 1 -name "*" -xtype f` > $infile
     1248    find /etc/modprobe.d -maxdepth 1 -name "*" -xtype f > $infile
    12491249    else
    12501250    infile="/etc/modules.conf"
     
    13311331    [ "$c_p" = "none" ] && continue
    13321332        absolute_partition=`ResolveSoftlink $c_p`
    1333     partition_mountpt=`cat $MY_FSTAB | tr -s '\t' ' ' | grep -w "$current_partition" | grep -vx " *#.*" | $AWK '{print $2}' | head -n1`
     1333    partition_mountpt=`tr -s '\t' ' ' < $MY_FSTAB | grep -w "$current_partition" | grep -vx " *#.*" | $AWK '{print $2}' | head -n1`
    13341334    redhat_label=""
    13351335    if [ "`echo "$current_partition" | fgrep -i "LABEL="`" != "" ] ; then
     
    13581358            totalsize=0
    13591359            items=0
    1360             for i in `cat /proc/swaps | tr -s ' ' '\t' | fgrep -v "Filename" | cut -f3` ; do
     1360            for i in `tr -s ' ' '\t' < /proc/swaps | fgrep -v "Filename" | cut -f3` ; do
    13611361            totalsize=$(($totalsize+$i))
    13621362            items=$(($items+1))
     
    14721472    echo -en "  " > $1
    14731473    if [ "`fgrep -i "debian" /etc/issue.net 2> /dev/null`" ] ; then
    1474         cat $MINDI_LIB/msg-txt | sed s/ZZZZZ/$MINDI_VERSION/ | sed s/YYYYY/"Mondo Rescue"/ | sed s/XXXXX/"a cousin of"/ | sed s%DDDDD%"Debian GNU\/`uname -s` `cut -d ' ' -f 3 /etc/issue.net` `hostname`"% | sed s/KKKKK/"Kernel `uname  -r` on a `uname -m`"/ | sed s/TTTTT/"`LC_TIME=C date`"/ >> $1.tmp
    1475     else
    1476         cat $MINDI_LIB/msg-txt | sed s/ZZZZZ/$MINDI_VERSION/ | sed s/YYYYY/"Mondo Rescue"/ | sed s/XXXXX/"a cousin of"/ | sed s/DDDDD/"`grep -i "linux" /etc/issue.net | head -n1 | tr -s ' ' ' '`"/ | sed s/KKKKK/"`grep -i "kernel" /etc/issue.net | head -n1 | tr -s ' ' ' '`"/ | sed s/TTTTT/"`LC_TIME=C date`"/ | sed s/' '\\r' 'on' 'an' '\/' '`uname -r`' 'on' 'an' '`uname -m`/ >> $1.tmp
    1477     fi
    1478     cat $1.tmp | sed s/%r/"`uname -r`"/ | sed s/%t/"`hostname`"/ > $1
     1474        sed s/ZZZZZ/$MINDI_VERSION/ $MINDI_LIB/msg-txt | sed s/YYYYY/"Mondo Rescue"/ | sed s/XXXXX/"a cousin of"/ | sed s%DDDDD%"Debian GNU\/`uname -s` `cut -d ' ' -f 3 /etc/issue.net` `hostname`"% | sed s/KKKKK/"Kernel `uname  -r` on a `uname -m`"/ | sed s/TTTTT/"`LC_TIME=C date`"/ >> $1.tmp
     1475    else
     1476        sed s/ZZZZZ/$MINDI_VERSION/ $MINDI_LIB/msg-txt | sed s/YYYYY/"Mondo Rescue"/ | sed s/XXXXX/"a cousin of"/ | sed s/DDDDD/"`grep -i "linux" /etc/issue.net | head -n1 | tr -s ' ' ' '`"/ | sed s/KKKKK/"`grep -i "kernel" /etc/issue.net | head -n1 | tr -s ' ' ' '`"/ | sed s/TTTTT/"`LC_TIME=C date`"/ | sed s/' '\\r' 'on' 'an' '\/' '`uname -r`' 'on' 'an' '`uname -m`/ >> $1.tmp
     1477    fi
     1478    sed s/%r/"`uname -r`"/ $1.tmp | sed s/%t/"`hostname`"/ > $1
    14791479    rm -f $1.tmp
    14801480    if [ "$CDRECOVERY" != "yes" ] ; then
     
    15961596    if [ -e "$MONDO_TMP/start-nfs" ] ; then
    15971597    mv isolinux.cfg isolinux.cfg.old
    1598     cat isolinux.cfg.old | sed s/interactive/iso/ > isolinux.cfg
     1598    sed s/interactive/iso/ isolinux.cfg.old > isolinux.cfg
    15991599    fi
    16001600    if [ "$ARCH" != "ia64" ] ; then
     
    16411641    disksize=$1
    16421642    if [ "`fgrep -i "debian" /etc/issue.net 2> /dev/null`" ] ; then
    1643         cat $MINDI_LIB/msg-txt | sed s/ZZZZZ/$MINDI_VERSION/ | sed s/YYYYY/"Mondo Rescue"/ | sed s/XXXXX/"a cousin of"/ | sed s%DDDDD%"Debian GNU\/`uname -s` `cut -d ' ' -f 3 /etc/issue.net` `hostname`"% | sed s/KKKKK/"Kernel `uname  -r` on a `uname -m`"/ | sed s/TTTTT/"`LC_TIME=C date`"/
    1644     else
    1645         cat $MINDI_LIB/msg-txt | sed s/ZZZZZ/$MINDI_VERSION/ | sed s/YYYYY/"Mondo Rescue"/ | sed s/XXXXX/"a cousin of"/ | sed s/DDDDD/"`grep -i "linux" /etc/issue.net | head -n1 | tr -s ' ' ' '`"/ | sed s/KKKKK/"`grep -i "kernel" /etc/issue.net | head -n1 | tr -s ' ' ' '`"/ | sed s/TTTTT/"`LC_TIME=C date`"/ | sed s/' 'r' 'on' 'an' 'm/' '`uname -r`' 'on' 'an' '`uname -m`/
     1643        sed s/ZZZZZ/$MINDI_VERSION/ $MINDI_LIB/msg-txt | sed s/YYYYY/"Mondo Rescue"/ | sed s/XXXXX/"a cousin of"/ | sed s%DDDDD%"Debian GNU\/`uname -s` `cut -d ' ' -f 3 /etc/issue.net` `hostname`"% | sed s/KKKKK/"Kernel `uname  -r` on a `uname -m`"/ | sed s/TTTTT/"`LC_TIME=C date`"/
     1644    else
     1645        sed s/ZZZZZ/$MINDI_VERSION/ $MINDI_LIB/msg-txt | sed s/YYYYY/"Mondo Rescue"/ | sed s/XXXXX/"a cousin of"/ | sed s/DDDDD/"`grep -i "linux" /etc/issue.net | head -n1 | tr -s ' ' ' '`"/ | sed s/KKKKK/"`grep -i "kernel" /etc/issue.net | head -n1 | tr -s ' ' ' '`"/ | sed s/TTTTT/"`LC_TIME=C date`"/ | sed s/' 'r' 'on' 'an' 'm/' '`uname -r`' 'on' 'an' '`uname -m`/
    16461646    fi
    16471647    if [ "$disksize" -gt "2880" ] ; then
     
    20182018    if [ -e "$MONDO_TMP/start-nfs" ] ; then
    20192019    mv syslinux.cfg syslinux.cfg.orig
    2020     cat syslinux.cfg.orig | sed s/interactive/iso/ > syslinux.cfg
     2020    sed s/interactive/iso/ syslinux.cfg.orig > syslinux.cfg
    20212021    fi
    20222022    cd $old_pwd
     
    24472447    tempfile=$TMP_ROOT/$$.strip.txt
    24482448    cp -f $1 $tempfile
    2449     cat $tempfile | $AWK '{if (substr($0,0,1)!="#" || substr($0,0,3)=="#!/") {print $0;};}' > $1
     2449    $AWK '{if (substr($0,0,1)!="#" || substr($0,0,3)=="#!/") {print $0;};}' $tempfile > $1
    24502450    rm -f $tempfile
    24512451    echo "Stripped comments from $2" >> $LOGFILE
Note: See TracChangeset for help on using the changeset viewer.