[patch] "echo" fixes and enhancements

slmodem.echo.patch (text/plain), 1.22 KB, created by Rouslan Solomakhin on 2004-08-05 08:38:53 UTC

--- slmodem.orig	2004-08-04 03:30:15.000000000 -0400
+++ slmodem.echo	2004-08-05 11:07:05.508244616 -0400
@@ -39,16 +39,16 @@
 	#sleep as per http://bugs.gentoo.org/show_bug.cgi?id=47947#c59
 	ebegin "Waiting for ${MODULE} modem driver initialisation"
 	local COUNT=0
-	echo -e "${NORMAL}   "
-	echo -ne "${NORMAL}"
+	# 52 in the line below is number of characters in ebegin statement + 7
+	if [ "$RC_NOCOLOR" != "yes"]; then echo -ne "\e[A\e[52G"; fi
 	while [ ! -c ${MDEV} -a ${COUNT} -lt 5 ];
 	do
 		sleep 0.5
-		echo -ne "."
+		echo -n "."
 		COUNT=`expr ${COUNT} + 1`
    	done
     
-	echo -ne "\n"
+	if [ "$RC_NOCOLOR" != "yes" ]; then echo; fi
     
 	if [ ! -c ${MDEV} ];
 	then
@@ -92,15 +92,15 @@
 	if [ ! "${MODULE}" == "alsa" ];
 	then
 		ebegin "Waiting for ${MODULE} modem driver unload"
-		echo -e "${NORMAL}   "
-		echo -ne "${NORMAL}"
+		# 44 is number of characters in ebegin statement + 7
+		if [ "$RC_NOCOLOR" != "yes"]; then echo -ne "\e[A\e[44G"; fi
 		for ((a=0,result=1; result==1 && a <= 5 ; a++))
 		do
 			sleep 0.25
-			echo -ne "."
+			echo -n "."
 			modprobe -r slamr 2> /dev/null && result=0
 		done
-		echo -ne "\n"
+		if [ "$RC_NOCOLOR" != "yes" ]; then echo; fi
 		eend ${result}
 	fi
 	unlink ${LN_DEV} 2> /dev/null