Changeset 914 in MondoRescue for trunk/contrib/mkcd

Timestamp:

Nov 2, 2006, 2:00:32 AM (18 years ago)

Author:

Bruno Cornec

Message:

merge -r902:913 $SVN_M/branches/stable

File:

• trunk/contrib/mkcd/setup (modified) (8 diffs)

trunk/contrib/mkcd/setup

@@ -150 +150 @@
     fi
 
-    res=`cat /etc/issue.net 2>/dev/null | fgrep -i turbolinux | head -n1`
+    res=`cat /etc/issue.net 2>/dev/null | grep -i turbolinux | head -n1`
     if [ "$res" != "" ] ; then
     echo "$res"
@@ -156 +156 @@
     fi
 
-    for fname in `find /etc -maxdepth 1 | fgrep release` /etc/issue.net ; do
-        res=`cat $fname 2>/dev/null | fgrep -i "linux" | head -n1 | tr -s '\t' ' '`
+    for fname in `find /etc -maxdepth 1 | grep release` /etc/issue.net ; do
+        res=`cat $fname 2>/dev/null | grep -i "linux" | head -n1 | tr -s '\t' ' '`
         [ "$res" = "" ] && res=`cat $fname |head -n1 | tr -s '\t' ' '`
         if [ "$res" != "" ] ; then
@@ -230 +230 @@
         [ "`echo "$i" | grep mindi`" ] && qq=head || qq=tail
         j=`find $1/ -type f -maxdepth 1 | grep "$i" | $qq -n1`
-        [ ! "$j" ] && j=`find RPMS/ -type f -maxdepth 1 | fgrep "$i" | $qq -n1`
+        [ ! "$j" ] && j=`find RPMS/ -type f -maxdepth 1 | grep -F "$i" | $qq -n1`
         if [ ! "$j" ] ; then
         echo "Looking for $i" >> /dev/stderr
@@ -254 +254 @@
         if echo "$j" | grep "\-$blah" &> /dev/null ; then
         k=`echo "$j" | cut -d'-' -f1,2`
-        if echo "$j" | grep -x "[A-Z,a-Z]*-[A-Z,a-Z]*-[A-Z,a-z]*-.*" &> /dev/null ; then
+        if echo "$j" | grep -E '^[A-Z,a-Z]*-[A-Z,a-Z]*-[A-Z,a-z]*-.*$' &> /dev/null ; then
             k=`echo "$j" | cut -d'-' -f1,2,3`
         fi
@@ -279 +279 @@
 #    echo "banner = $banner" >> /dev/stderr
     for i in $banner ; do
-    j=`echo $i | grep -x "[v|V][0-9]+*.*"`
-    [ ! "$j" ] && j=`echo $i | grep -x "[0-9]+*.*"`
-    echo "$j" | grep -x "[0-9]*)" > /dev/null && continue
+    j=`echo $i | grep -E '^[v|V][0-9]+*.*$'`
+    [ ! "$j" ] && j=`echo $i | grep -E '^[0-9]+*.*$'`
+    echo "$j" | grep -E '^[0-9]*)$' > /dev/null && continue
     [ "$j" ] && res=`echo $j | sed s/v// | sed s/V//`
     done
@@ -610 +610 @@
 
 StrStr() {
-  [ "`echo "$1" | fgrep -i "$2"`" ] && return 0 || return 1
+  [ "`echo "$1" | grep -Fi "$2"`" ] && return 0 || return 1
 }
 
@@ -674 +674 @@
 echo -en "Do you want to install the (S)table or the (D)evelopment branch of Mondo? "
 read ch
-if [ "`echo "development" | fgrep -i "$ch"`" ] ; then
+if [ "`echo "development" | grep -Fi "$ch"`" ] ; then
     MY_BRANCH=$DEVEL_BRANCH
     MINDI_BRANCH=1.1
@@ -703 +703 @@
     echo -en "Shall I do that (y/n)? "
     read ch
-    if [ "`echo "YESyesYes" | fgrep "$ch"`" ] ; then
+    if [ "`echo "YESyesYes" | grep -F "$ch"`" ] ; then
         distro=RHT
         version=7.2