[SCM] Debian Live build scripts branch, master, updated. 1.0.2-2-9-g5bbbfda

[Chris Lamb]

The following commit has been merged in the master branch:
commit 9792b9fffd0f610b1889eccf5dc5fcf88bf84fc8
Author: Chris Lamb <lamby at debian.org>
Date:   Sat Jan 10 03:56:46 2009 +0000

    Corrected value of disabled _COLOR option from "false" => "disabled".
    
    This prevents the color output being displayed by default (as
    functions/defaults.sh sets _COLOR="disabled"; we previously checked for "false")
    
    Signed-off-by: Chris Lamb <lamby at debian.org>

diff --git a/functions/echo.sh b/functions/echo.sh
index c217dbd..7a30831 100755
--- a/functions/echo.sh
+++ b/functions/echo.sh
@@ -50,7 +50,7 @@ Echo_debug_running ()
 			printf "D: $(eval_gettext "${STRING}")" "${@}"
 		fi
 
-		if [ "${_COLOR}" = "false" ]
+		if [ "${_COLOR}" = "disabled" ]
 		then
 			printf "..."
 		else
@@ -64,7 +64,7 @@ Echo_error ()
 	STRING="${1}"
 	shift
 
-	if [ "${_COLOR}" = "false" ]
+	if [ "${_COLOR}" = "disabled" ]
 	then
 		printf "E:"
 	else
@@ -86,7 +86,7 @@ Echo_message ()
 		STRING="${1}"
 		shift
 
-		if [ "${_COLOR}" = "false" ]
+		if [ "${_COLOR}" = "disabled" ]
 		then
 			printf "P:"
 		else
@@ -109,7 +109,7 @@ Echo_message_running ()
 		STRING="${1}"
 		shift
 
-		if [ "${_COLOR}" = "false" ]
+		if [ "${_COLOR}" = "disabled" ]
 		then
 			printf "P:"
 		else
@@ -123,7 +123,7 @@ Echo_message_running ()
 			printf " $(eval_gettext "${STRING}")" "${@}";
 		fi
 
-		if [ "${_COLOR}" = "false" ]
+		if [ "${_COLOR}" = "disabled" ]
 		then
 			printf "..."
 		else
@@ -176,7 +176,7 @@ Echo_warning ()
 	STRING="${1}"
 	shift
 
-	if [ "${_COLOR}" = "false" ]
+	if [ "${_COLOR}" = "disabled" ]
 	then
 		printf "W:"
 	else
@@ -195,7 +195,7 @@ Echo_status ()
 {
 	__RETURN="${?}"
 
-	if [ "${_COLOR}" = "false" ]
+	if [ "${_COLOR}" = "disabled" ]
 	then
 		if [ "${__RETURN}" = "0" ]
 		then
@@ -217,7 +217,7 @@ Echo_status ()
 
 Echo_done ()
 {
-	if [ "${_COLOR}" = "false" ]
+	if [ "${_COLOR}" = "disabled" ]
 	then
 		printf " already done.\n"
 	else

-- 
Debian Live build scripts