[Devil-linux-commit] build/scripts build.sh,1.97,1.98

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv22319/1.3/build/scripts

Modified Files:
	build.sh 
Log Message:
whitespacing fixed


Index: build.sh
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/build.sh,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -d -r1.97 -r1.98

--- build.sh	25 May 2006 18:16:26 -0000	1.97
+++ build.sh	25 May 2006 18:29:30 -0000	1.98
@@ -43,19 +43,19 @@
 
 	case $CMD in
 	makefile)
-	    for CMD in build install iso
-	    do
-			# set the correct "runlevel"
-			if [ "$CMD" = "build" ]; then
-				LEVEL=1
-			elif [ "$CMD" = "install" ]; then
-				LEVEL=2
-			elif [ "$CMD" = "iso" ]; then
-				LEVEL=3
-			else
-				echo "Someone messed up this script :("
-				exit 1
-			fi
+			for CMD in build install iso
+			do
+				# set the correct "runlevel"
+				if [ "$CMD" = "build" ]; then
+					LEVEL=1
+				elif [ "$CMD" = "install" ]; then
+					LEVEL=2
+				elif [ "$CMD" = "iso" ]; then
+					LEVEL=3
+				else
+					echo "Someone messed up this script :("
+					exit 1
+				fi
 
 				# fake uname to display another platform we want to compile the kernel for
 				# also make sure our kernel version is displayed
@@ -68,9 +68,9 @@
 					test -f /bin/arch.old || cp /bin/arch /bin/arch.old || exit 1
 					echo "/bin/uname -m" > /bin/arch || exit 1
 				else
-				    echo "ERROR !!!"
-				    echo "Could not determine Kernel Version (variable \$KERNELVERSION not set)"
-				    exit 1
+					echo "ERROR !!!"
+					echo "Could not determine Kernel Version (variable \$KERNELVERSION not set)"
+					exit 1
 				fi
 
 			LASTNO=""
@@ -93,13 +93,13 @@
 				THISNO=${LINK:0:3}
 				
 				if [ "$THISNO" != "$LASTNO" ]; then
-				    if [ "$THISGROUP" != ""  ] ; then
-					echo "$LASTNO =$THISGROUP" >> $WORKDIR/Makefile.inc1.$CMD
-				    fi
-				    THISGROUP=""
-				    if [ "$LASTNO" != ""  ] ; then
-					ALLGROUPS="$ALLGROUPS \$($LASTNO)"
-				    fi
+					if [ "$THISGROUP" != "" ] ; then
+						echo "$LASTNO =$THISGROUP" >> $WORKDIR/Makefile.inc1.$CMD
+					fi
+					THISGROUP=""
+					if [ "$LASTNO" != "" ] ; then
+						ALLGROUPS="$ALLGROUPS \$($LASTNO)"
+					fi
 				fi
 								
 				DONEFILE="${DONE}_${CMD}_${SCRIPT}"
@@ -116,38 +116,38 @@
 				fi
 
 				if [ "$THISNO" != "$LASTNO" ]; then
-				    BEFORENO=$LASTNO
+					BEFORENO=$LASTNO
 				fi
 
-				if [ "$BEFORENO" != ""  ] ; then
-				    #REQ="\$($BEFORENO)"
-				    REQ=" | \$($BEFORENO)"
+				if [ "$BEFORENO" != "" ] ; then
+					#REQ="\$($BEFORENO)"
+					REQ=" | \$($BEFORENO)"
 				else
-				    REQ=""
+					REQ=""
 				fi
 
 				SOURCEDIR=$(find_src_dir $SCRIPT)
 
 				echo "$DONEFILE: $REQ" >> $WORKDIR/Makefile.$CMD
 				if [ "$CONFIG_DISABLELOGGING" = "y" ]; then
-				    LOG=""
+					LOG=""
 				else
-				    echo "		mkdir -p $WORKDIR/LOGS/$CMD" >> $WORKDIR/Makefile.$CMD
-				    LOG="&> $WORKDIR/LOGS/$CMD/$SCRIPT"
+					echo "		mkdir -p $WORKDIR/LOGS/$CMD" >> $WORKDIR/Makefile.$CMD
+					LOG="&> $WORKDIR/LOGS/$CMD/$SCRIPT"
 				fi
-				echo "		(  source $MYDIR/settings ; cd $SOURCEDIR ; ( $NICE $MYDIR/$SCRIPT $CMD $LOG ) )" >> $WORKDIR/Makefile.$CMD
+				echo "		( source $MYDIR/settings ; cd $SOURCEDIR ; ( $NICE $MYDIR/$SCRIPT $CMD $LOG ) )" >> $WORKDIR/Makefile.$CMD
 				echo "		touch $DONEFILE" >> $WORKDIR/Makefile.$CMD
 				echo >> $WORKDIR/Makefile.$CMD
 				
 				LASTNO=$THISNO
 			done
-			if [ "$THISGROUP" != ""  ] ; then
-			    echo "$THISNO =$THISGROUP" >> $WORKDIR/Makefile.inc1.$CMD
+			if [ "$THISGROUP" != "" ] ; then
+				echo "$THISNO =$THISGROUP" >> $WORKDIR/Makefile.inc1.$CMD
 			fi
 			echo ".PHONY: all " >> $WORKDIR/Makefile.inc2.$CMD
 			echo "all : $ALLGROUPS \$($LASTNO)" >> $WORKDIR/Makefile.inc2.$CMD
 
-			make -j $CONFIG_PARALLEL_JOBS  -C $WORKDIR -f Makefile.$CMD || exit 1
+			make -j $CONFIG_PARALLEL_JOBS -C $WORKDIR -f Makefile.$CMD || exit 1
 		done
 			
 			
@@ -208,15 +208,15 @@
 			echo -n "cleaning $DL_DIR/dist  "
 			${NICE} rm -rf $DL_DIR/dist
 			echo "done"
-			echo -n "cleaning $ETCDIR "
+			echo -n "cleaning $ETCDIR  "
 			${NICE} rm -rf $ETCDIR
 			echo "done"
-			echo "cleaning $CDDOCDIR "
+			echo "cleaning $CDDOCDIR  "
 			${NICE} rm -rf $CDDOCDIR
-			echo -n "cleaning $ISODIR "
+			echo -n "cleaning $ISODIR  "
 			${NICE} rm -rf $ISODIR
 			echo "done"
-			echo -n "cleaning flag files "
+			echo -n "cleaning flag files  "
 			${NICE} rm -f ${DONE}_install*
 			${NICE} rm -f ${DONE}_iso*
 			echo "done"
@@ -242,32 +242,32 @@
 
 			mkdir -p $WORKDIR
 			pushd $WORKDIR > /dev/null
-                        for DIR in $SRCDIR $SRCEXTRADIR
-                        do
-			    for TAR in $(ls $DIR/*.tar.bz2 2>/dev/null)
-                            do
-                                echo unpacking $TAR
-                                ${NICE} tar -xjf $TAR || exit 1
-                            done
+			for DIR in $SRCDIR $SRCEXTRADIR
+			do
+				for TAR in $(ls $DIR/*.tar.bz2 2>/dev/null)
+				do
+					echo unpacking $TAR
+					${NICE} tar -xjf $TAR || exit 1
+				done
 
-			    for TAR in $(ls $DIR/*.tar.gz 2>/dev/null)
-                            do
-                                echo unpacking $TAR
-                                ${NICE} tar -xzf $TAR || exit 1
-                            done
+				for TAR in $(ls $DIR/*.tar.gz 2>/dev/null)
+				do
+					echo unpacking $TAR
+					${NICE} tar -xzf $TAR || exit 1
+				done
 
-			    for TAR in $(ls $DIR/*.tgz 2>/dev/null)
-                            do
-                                echo unpacking $TAR
-                                ${NICE} tar -xzf $TAR || exit 1
-                            done
+				for TAR in $(ls $DIR/*.tgz 2>/dev/null)
+				do
+					echo unpacking $TAR
+					${NICE} tar -xzf $TAR || exit 1
+				done
 
-			    for TAR in $(ls $DIR/*.tar.Z  2>/dev/null)
-                            do
-                                echo unpacking $TAR
-                                ${NICE} tar -xzf $TAR || exit 1
-                            done
-                        done
+				for TAR in $(ls $DIR/*.tar.Z 2>/dev/null)
+				do
+					echo unpacking $TAR
+					${NICE} tar -xzf $TAR || exit 1
+				done
+			done
 
 			popd > /dev/null
 			;;
@@ -373,20 +373,20 @@
 			source $BUILD_CONFIG
 
 			if [ "$CONFIG_USE_DISTCC" = "y" ] && [ -f /usr/bin/distccd ]; then
-			    if [ -z "$DISTCC_HOSTS" ]; then
-				echo "ERROR"
-			        echo "DISTCC_HOSTS is not defined!"
-				errorbeep
-				exit 1
-			    else
-				export DISTCC_HOSTS
-			    fi
-			    echo Killing running distccd...
-			    killall distccd
-			    sleep 1
-			    echo Starting distccd...
-			    test -f /usr/bin/distccd && /usr/bin/distccd --daemon || exit 1
-			    export PATH=/usr/lib/distcc/bin:$PATH
+				if [ -z "$DISTCC_HOSTS" ]; then
+					echo "ERROR"
+					echo "DISTCC_HOSTS is not defined!"
+					errorbeep
+					exit 1
+				else
+					export DISTCC_HOSTS
+				fi
+				echo Killing running distccd...
+				killall distccd
+				sleep 1
+				echo Starting distccd...
+				test -f /usr/bin/distccd && /usr/bin/distccd --daemon || exit 1
+				export PATH=/usr/lib/distcc/bin:$PATH
 			fi
 
 			mkdir -p $WORKDIR/LOGS/$CMD || exit 1
@@ -439,9 +439,9 @@
 
 					if [ -z "$RUN_ONLY_CMD" ];then
 						if [ "$CONFIG_DISABLELOGGING" = "y" ]; then
-						    ${NICE} $MYDIR/$SCRIPT $CMD
+							${NICE} $MYDIR/$SCRIPT $CMD
 						else
-						    ${NICE} $MYDIR/$SCRIPT $CMD &> $WORKDIR/LOGS/$CMD/$SCRIPT
+							${NICE} $MYDIR/$SCRIPT $CMD &> $WORKDIR/LOGS/$CMD/$SCRIPT
 						fi
 					else
 						${NICE} $MYDIR/$SCRIPT $CMD



