[SCM] debian-live branch, master, updated. 1.0_a48-1-89-gbdc4ff6

Chris Lamb chris at chris-lamb.co.uk
Fri Aug 15 22:28:11 UTC 2008


The following commit has been merged in the master branch:
commit bdc4ff6457437eaaaccc80fc44c70dee0af8f5bf
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Fri Aug 15 23:08:43 2008 +0100

    Don't use interpolation to print usage and help as it breaks newlines and tabs.
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>

diff --git a/functions/help.sh b/functions/help.sh
index 5bad826..c0d3fe6 100755
--- a/functions/help.sh
+++ b/functions/help.sh
@@ -18,7 +18,7 @@ Help ()
 
 	if [ -n "${USAGE}" ]
 	then
-		Echo "%s" "${USAGE}"
+		Echo "${USAGE}"
 		echo
 	fi
 	Echo "  %s [-h|--help]" "${PROGRAM}"
@@ -28,7 +28,7 @@ Help ()
 
 	if [ -n "${HELP}" ]
 	then
-		Echo "%s" "${HELP}"
+		Echo "${HELP}"
 		echo
 	fi
 
diff --git a/functions/usage.sh b/functions/usage.sh
index f228dd7..08161ae 100755
--- a/functions/usage.sh
+++ b/functions/usage.sh
@@ -18,7 +18,7 @@ Usage ()
 
 	if [ -n "${USAGE}" ]
 	then
-		Echo "  %s" "${USAGE}"
+		Echo " ${USAGE}"
 		echo
 	fi
 

-- 
debian-live



More information about the debian-live-changes mailing list