r2398 - jhalfs/branches/experimental/CLFS

georgeb at linuxfromscratch.org georgeb at linuxfromscratch.org
Thu Mar 23 14:33:15 PST 2006


Author: georgeb
Date: 2006-03-23 15:33:14 -0700 (Thu, 23 Mar 2006)
New Revision: 2398

Modified:
   jhalfs/branches/experimental/CLFS/master.sh
Log:
CLFS/master.sh, changed coding style- removed _IS_ usage

Modified: jhalfs/branches/experimental/CLFS/master.sh
===================================================================
--- jhalfs/branches/experimental/CLFS/master.sh	2006-03-23 20:51:11 UTC (rev 2397)
+++ jhalfs/branches/experimental/CLFS/master.sh	2006-03-23 22:33:14 UTC (rev 2398)
@@ -299,7 +299,9 @@
     this_script=`basename $file`
     #
     # Skipping scripts is done now and not included in the build tree.
-    [[ `_IS_ $this_script chroot` ]]   && continue
+    case $this_script in
+      *chroot*) continue ;;
+    esac
 
     #
     # First append each name of the script files to a list (this will become
@@ -471,9 +473,10 @@
     this_script=`basename $file`
 
     # Test if the stripping phase must be skipped
-    if [ "$STRIP" = "0" ] && [[ `_IS_ ${this_script} stripping` ]] ; then
-      continue
-    fi
+    case $this_script in
+      *stripping*) [[ "$STRIP" = "0" ]] && continue
+       ;;
+    esac
 
     # First append each name of the script files to a list (this will become
     # the names of the targets in the Makefile
@@ -533,9 +536,10 @@
     this_script=`basename $file`
 
     # Test if the stripping phase must be skipped
-    if [ "$STRIP" = "0" ] && [[ `_IS_ ${this_script} stripping` ]] ; then
-      continue
-    fi
+    case $this_script in 
+      *stripping*) [[ "$STRIP" = "0" ]] && continue
+       ;;
+    esac
 
     # First append each name of the script files to a list (this will become
     # the names of the targets in the Makefile
@@ -610,8 +614,10 @@
                                   -e 's at -64@@' \
                                   -e 's at 64@@' \
                                   -e 's at n32@@'`
-    if [[ `_IS_ $name bootscripts` ]]; then name=bootscripts-cross-lfs; fi
-
+    case $name in
+      *bootscripts*) name=bootscripts-cross-lfs
+       ;;
+    esac
     vrs=`grep "^$name-version" $JHALFSDIR/packages | sed -e 's/.* //' -e 's/"//g'`
 
     #--------------------------------------------------------------------#
@@ -669,8 +675,10 @@
                                   -e 's at -64@@' \
                                   -e 's at 64@@' \
                                   -e 's at n32@@'`
-    if [[ `_IS_ $name bootscripts` ]]; then name=lfs-bootscripts; fi
-
+    case $name in
+      *bootscripts*) name=bootscripts-cross-lfs
+       ;;
+    esac
     vrs=`grep "^$name-version" $JHALFSDIR/packages | sed -e 's/.* //' -e 's/"//g'`
 
     #--------------------------------------------------------------------#
@@ -730,8 +738,10 @@
     #
     # Grab the name of the target, strip id number and misc words.
     name=`echo $this_script | sed -e 's@[0-9]\{3\}-@@' -e 's at -build@@' `
-    [[ `_IS_ $this_script "kernel"` ]] && name=linux
-
+    case $this_script in
+      *kernel*) name=linux
+       ;;
+    esac
     vrs=`grep "^$name-version" $JHALFSDIR/packages | sed -e 's/.* //' -e 's/"//g'`
 
     #--------------------------------------------------------------------#




More information about the alfs-log mailing list