[IPCop-cvs] ipcop make.sh,1.264,1.265

[Ivan K. <ch...@us...>]

Update of /cvsroot/ipcop/ipcop
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv5557

Modified Files:
	make.sh 
Log Message:
message

Index: make.sh
===================================================================
RCS file: /cvsroot/ipcop/ipcop/make.sh,v
retrieving revision 1.264
retrieving revision 1.265
diff -C2 -d -r1.264 -r1.265
*** make.sh	31 Jul 2006 00:34:12 -0000	1.264
--- make.sh	31 Jul 2006 00:42:38 -0000	1.265
***************
*** 168,172 ****
  			;;
  		make_pkg)
! 			echo "$2" | while read PKG_VER PROGRAM OPTIONS; do
  				SET_VER_COL_REAL=`position_cursor $OPT_COL $PKG_VER -3`
  
--- 168,173 ----
  			;;
  		make_pkg)
! 			echo "$2" | while read PKG_VER PROGRAM OPTIONS
! 			do
  				SET_VER_COL_REAL=`position_cursor $OPT_COL $PKG_VER -3`
  
***************
*** 290,294 ****
  	echo							>> $IPCOP_CONFIG
  
! 	while [ "$ANSWER" != "no" ]; do
  		ask_for_input "Do you want to use a link to a common cache directory" "no yes"
  		[ "$ANSWER" == "yes" ] && {
--- 291,296 ----
  	echo							>> $IPCOP_CONFIG
  
! 	while [ "$ANSWER" != "no" ]
! 	do
  		ask_for_input "Do you want to use a link to a common cache directory" "no yes"
  		[ "$ANSWER" == "yes" ] && {
***************
*** 309,313 ****
  	echo "#Disable global build stage" 				>> $IPCOP_CONFIG
  	AUTOYES=$ANSWER
! 	for i in BASE IPCOP INSTALLER PACKAGES; do
  		if [ "$AUTOYES" == "yes" ]; then
  			ANSWER="yes"
--- 311,316 ----
  	echo "#Disable global build stage" 				>> $IPCOP_CONFIG
  	AUTOYES=$ANSWER
! 	for i in BASE IPCOP INSTALLER PACKAGES
! 	do
  		if [ "$AUTOYES" == "yes" ]; then
  			ANSWER="yes"
***************
*** 399,403 ****
  {
  	stdumount
! 	for i in `seq 0 7`; do
  		if ( losetup /dev/loop${i} 2>/dev/null | grep -q "/install/images" ); then
  			losetup -d /dev/loop${i} 2>/dev/null
--- 402,407 ----
  {
  	stdumount
! 	for i in `seq 0 7`
! 	do
  		if ( losetup /dev/loop${i} 2>/dev/null | grep -q "/install/images" ); then
  			losetup -d /dev/loop${i} 2>/dev/null
***************
*** 753,757 ****
  	# Script slipped?
  	local i
! 	for i in $SKIP_PACKAGE_LIST; do
  		if [ "$i" == "$1" ]; then  
  			beautify result SKIP
--- 757,762 ----
  	# Script slipped?
  	local i
! 	for i in $SKIP_PACKAGE_LIST
! 	do
  		if [ "$i" == "$1" ]; then  
  			beautify result SKIP
***************
*** 1344,1348 ****
  	[ ! -z "$FORCE_REBUILD_LIST" ] && {
  		cd $BASEDIR/log_${MACHINE}_${USE_LIBC}
! 		for i in $FORCE_REBUILD_LIST; do rm -f $i; done
  	}
  
--- 1349,1356 ----
  	[ ! -z "$FORCE_REBUILD_LIST" ] && {
  		cd $BASEDIR/log_${MACHINE}_${USE_LIBC}
! 		for i in $FORCE_REBUILD_LIST
! 		do
! 			rm -f $i
! 		done
  	}
  
***************
*** 1441,1445 ****
  	FINISHED=0
  	cd $BASEDIR/lfs
! 	for c in `seq $MAX_RETRIES`; do
  		if (( FINISHED==1 )); then
  			break
--- 1449,1454 ----
  	FINISHED=0
  	cd $BASEDIR/lfs
! 	for c in `seq $MAX_RETRIES`
! 	do
  		if (( FINISHED==1 )); then
  			break
***************
*** 1448,1452 ****
  		FINISHED=1
  		cd $BASEDIR/lfs
! 		for i in *; do
  			if [ -f "$i" -a "$i" != "Config" ]; then
  				make -s -f $i MACHINE=$MACHINE LFS_BASEDIR=$BASEDIR ROOT=$LFS \
--- 1457,1462 ----
  		FINISHED=1
  		cd $BASEDIR/lfs
! 		for i in *
! 		do
  			if [ -f "$i" -a "$i" != "Config" ]; then
  				make -s -f $i MACHINE=$MACHINE LFS_BASEDIR=$BASEDIR ROOT=$LFS \
***************
*** 1472,1480 ****
  	ask_for_input "I am about to delete my $MACHINE $USE_LIBC tree " "no yes"
  	if [ "$ANSWER" == "yes" ]; then
! 		for i in `mount | grep $BASEDIR | sed 's/^.*loop=\(.*\))/\1/'`; do
  			$LOSETUP -d $i 2>/dev/null
  		done
  
! 		for i in `mount | grep $BASEDIR | cut -d " " -f 1`; do
  			umount $i
  		done
--- 1482,1492 ----
  	ask_for_input "I am about to delete my $MACHINE $USE_LIBC tree " "no yes"
  	if [ "$ANSWER" == "yes" ]; then
! 		for i in `mount | grep $BASEDIR | sed 's/^.*loop=\(.*\))/\1/'`
! 		do
  			$LOSETUP -d $i 2>/dev/null
  		done
  
! 		for i in `mount | grep $BASEDIR | cut -d " " -f 1`
! 		do
  			umount $i
  		done
***************
*** 1482,1486 ****
  		stdumount
  
! 		for i in `seq 0 7`; do
  			if ( losetup /dev/loop${i} 2>/dev/null | grep -q "/install/images" ); then
  				umount /dev/loop${i}     2>/dev/null;
--- 1494,1499 ----
  		stdumount
  
! 		for i in `seq 0 7`
! 		do
  			if ( losetup /dev/loop${i} 2>/dev/null | grep -q "/install/images" ); then
  				umount /dev/loop${i}     2>/dev/null;
***************
*** 1558,1562 ****
  	FINISHED=0
  	cd $BASEDIR/lfs
! 	for c in `seq $MAX_RETRIES`; do
  		if (( FINISHED==1 )); then 
  			break
--- 1571,1576 ----
  	FINISHED=0
  	cd $BASEDIR/lfs
! 	for c in `seq $MAX_RETRIES`
! 	do
  		if (( FINISHED==1 )); then 
  			break
***************
*** 1565,1569 ****
  		FINISHED=1
  		cd $BASEDIR/lfs
! 		for i in `grep -l "^HOST_ARCH" *`; do
  			HOST_ARCH=`grep ^HOST_ARCH $i | awk '{print $3}'`
  			if [ "$HOST_ARCH" == "$MACHINE" -o "$HOST_ARCH" == "all" ]; then
--- 1579,1584 ----
  		FINISHED=1
  		cd $BASEDIR/lfs
! 		for i in `grep -l "^HOST_ARCH" *`
! 		do
  			HOST_ARCH=`grep ^HOST_ARCH $i | awk '{print $3}'`
  			if [ "$HOST_ARCH" == "$MACHINE" -o "$HOST_ARCH" == "all" ]; then
***************
*** 1590,1594 ****
  	echo "Prefetch : verifying md5sum"
  	ERROR=0
! 	for i in `grep -l "^HOST_ARCH" *`; do
  		HOST_ARCH=`grep ^HOST_ARCH $i | awk '{print $3}'`
  		if [ "$HOST_ARCH" == "$MACHINE" -o "$HOST_ARCH" == "all" ]; then
--- 1605,1610 ----
  	echo "Prefetch : verifying md5sum"
  	ERROR=0
! 	for i in `grep -l "^HOST_ARCH" *`
! 	do
  		HOST_ARCH=`grep ^HOST_ARCH $i | awk '{print $3}'`
  		if [ "$HOST_ARCH" == "$MACHINE" -o "$HOST_ARCH" == "all" ]; then