Changeset 98 in MondoRescue for trunk/mindi/mindi

Timestamp:

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

Author:

bcornec

Message:

merge -r 96:97 from 2.04 branch

File:

• trunk/mindi/mindi (modified) (3 diffs)

trunk/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