[Devil-linux-commit] build/scripts build.sh,1.78,1.79

[Friedrich L. <fr...@us...>]

Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19636/scripts

Modified Files:
	build.sh 
Log Message:
let the user decide if he wants to run the build nice'd or not 
[defaults to yes]



Index: build.sh
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/build.sh,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -d -r1.78 -r1.79
--- build.sh	24 Mar 2004 02:04:05 -0000	1.78
+++ build.sh	11 Apr 2004 00:21:56 -0000	1.79
@@ -25,6 +25,12 @@
 # make sure /tmp has the correct rights
 chmod 1777 /tmp
 
+NICE=nice
+# does the user not want to use nice?
+if [ "$CONFIG_NICE" != "y" ]; then
+	NICE=""
+fi
+
 until [ -z "$1" ]; do
 	CMD=$1
 	# read optional parameter
@@ -69,7 +75,7 @@
 			find ./ -name CVS | xargs rm -rf || exit 1
 			mkdir -p $DL_DIR/dist || exit 1
 			echo "compressing files"
-			nice tar -cjf $DL_DIR/dist/devil-linux-$DL_VERSION_FULL$DLDEV.tar.bz2 . || exit 1
+			${NICE} tar -cjf $DL_DIR/dist/devil-linux-$DL_VERSION_FULL$DLDEV.tar.bz2 . || exit 1
 			rm -rf $DL_DIR/dist/devil-linux-$DL_VERSION_FULL
 			mv * $DL_DIR/dist
 			cp $DL_DIR/CHANGES $DL_DIR/dist/CHANGES-devil-linux-$DL_VERSION_FULL$DLDEV
@@ -77,21 +83,21 @@
 			;;
 	mrproper )
 			echo -n "cleaning $DL_DIR/dist  "
-			nice rm -rf $DL_DIR/dist
+			${NICE} rm -rf $DL_DIR/dist
 			echo "done"
 			echo -n "cleaning $WORKDIR  "
-			nice rm -rf $WORKDIR
+			${NICE} rm -rf $WORKDIR
 			echo "done"
 			;;
 	clean )
 			echo "cleaning $ETCDIR"
-			nice rm -rf $ETCDIR
+			${NICE} rm -rf $ETCDIR
 			echo "cleaning $CDDOCDIR"
-			nice rm -rf $CDDOCDIR
+			${NICE} rm -rf $CDDOCDIR
 			echo "cleaning $ISODIR"
-			nice rm -rf $ISODIR
-			nice rm -f ${DONE}_install*
-			nice rm -f ${DONE}_iso*
+			${NICE} rm -rf $ISODIR
+			${NICE} rm -f ${DONE}_install*
+			${NICE} rm -f ${DONE}_iso*
 			echo "done"
 			;;
 
@@ -118,25 +124,25 @@
 			for TAR in `ls $SRCDIR/*.tar.bz2`
 			do
 				echo unpacking $TAR
-				nice tar -xjf $TAR || exit 1
+				${NICE} tar -xjf $TAR || exit 1
 			done
 
 			for TAR in `ls $SRCDIR/*.tar.gz`
 			do
 				echo unpacking $TAR
-				nice tar -xzf $TAR || exit 1
+				${NICE} tar -xzf $TAR || exit 1
 			done
 
 			for TAR in `ls $SRCDIR/*.tgz`
 			do
 				echo unpacking $TAR
-				nice tar -xzf $TAR || exit 1
+				${NICE} tar -xzf $TAR || exit 1
 			done
 
 			for TAR in `ls $SRCDIR/*.tar.Z`
 			do
 				echo unpacking $TAR
-				nice tar -xzf $TAR || exit 1
+				${NICE} tar -xzf $TAR || exit 1
 			done
 
 			popd > /dev/null
@@ -177,7 +183,7 @@
 			pushd $DL_DIR/scripts/.buildorder/ &> /dev/null
 			ln -sf ../* ./
 			popd &> /dev/null
-			nice insserv -f -d $(grep -l "# DL-build-system v3" $DL_DIR/scripts/.buildorder/* | grep -v "build\.sh") || exit 1
+			${NICE} insserv -f -d $(grep -l "# DL-build-system v3" $DL_DIR/scripts/.buildorder/* | grep -v "build\.sh") || exit 1
 			#echo NOT creating links for:
 			#grep -L "# DL-build-system v3" $DL_DIR/scripts/.buildorder/* | grep -v "build\.sh" 2> /dev/null
 
@@ -309,12 +315,12 @@
 
 					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
+						${NICE} $MYDIR/$SCRIPT $CMD
 					fi
 					RETVAL=$?
 					t2=$(date +"%s")