Changeset 911 in MondoRescue for branches/stable/mindi

Timestamp:

Nov 1, 2006, 7:46:51 PM (17 years ago)

Author:

Bruno Cornec

Message:

Further removal of all instances of grep -wx in code.

Location:

branches/stable/mindi

Files:

• analyze-my-lvm (modified) (2 diffs)
• aux-tools/sbin/calc-disk-size (modified) (1 diff)
• install.sh (modified) (1 diff)
• rootfs/sbin/init (modified) (1 diff)

branches/stable/mindi/analyze-my-lvm

@@ -94 +94 @@
     allocation=`GetValueFromField $fname "LV Size"`
     [ ! "`echo "$allocation" | grep "[k,m,g]"`" ] && allocation="$allocation"m
-    if echo "$allocation" | grep -x ".*g" > /dev/null 2> /dev/null ; then
+    if echo "$allocation" | grep -E '^.*g$' > /dev/null 2> /dev/null ; then
         val=`echo "$allocation" | sed s/g//`
         allocation=`echo "$val" | awk '{c=$1; printf "%d", c*1024;}'`m
@@ -169 +169 @@
 
 ListLvmDrivesAndPartitions() {
-    $LVMCMD vgdisplay -v 2> /dev/null |grep "PV Name" | sed 's/(#)//' | awk '{print $3}'
+    $LVMCMD vgdisplay -v 2> /dev/null | grep "PV Name" | sed 's/(#)//' | awk '{print $3}'
 }
 

branches/stable/mindi/aux-tools/sbin/calc-disk-size

@@ -28 +28 @@
 # ---------------- main ---------------
 
-if [ "$#" -ne "1" ] || [ "`echo "$1" |grep -x "/dev/[a-z]*"`" = "" ]; then
+if [ "$#" -ne "1" ] || [ "`echo "$1" |grep -E '^/dev/[a-z]*$'`" = "" ]; then
     LogIt "calc-disk-size <device>" 1
     exit 1

branches/stable/mindi/install.sh

@@ -35 +35 @@
 
 ARCH=`/bin/arch`
-echo $ARCH | grep -x "i[0-9]86" &> /dev/null && ARCH=i386 && locallib=$local/lib
-echo $ARCH | grep -x "x86_64" &> /dev/null && locallib=$local/lib64
-echo $ARCH | grep -x "ia64" &> /dev/null && locallib=$local/lib
+echo $ARCH | grep -E '^i[0-9]86$' &> /dev/null && ARCH=i386 && locallib=$local/lib
+echo $ARCH | grep -E '^x86_64$' &> /dev/null && locallib=$local/lib64
+echo $ARCH | grep -E '^ia64$' &> /dev/null && locallib=$local/lib
 export ARCH
 

branches/stable/mindi/rootfs/sbin/init

@@ -239 +239 @@
         [ -d "/proc/1" ] || mount -n /proc
         LogIt "Kernel support found. Creating config file and starting devfsd"
-        conffile=`strings $loc | grep "devfsd.conf$"`
+        conffile=`strings $loc | grep -E "devfsd.conf$"`
         [ "$conffile" ] || conffile="/etc/devfsd.conf"
         confpath=`echo $conffile | sed "s/\/devfsd\.conf$//"`