t6000lib: tr portability fix

peff · gitster · commit cde2ed25ad76 · 2008-03-13T00:57:53.000-07:00
Some versions of tr complain if the number of characters in
both sets isn't the same. So here we must manually expand
the dashes in set2.

Signed-off-by: Jeff King &lt;peff@peff.net&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/t/t6000lib.sh b/t/t6000lib.sh
@@ -97,7 +97,10 @@ check_output()
 # from front and back.
 name_from_description()
 {
-        tr "'" '-' | tr '~`!@#$%^&*()_+={}[]|\;:"<>,/? ' '-' | tr -s '-' | tr '[A-Z]' '[a-z]' | sed "s/^-*//;s/-*\$//"
+        tr "'" '-' |
+		tr '~`!@#$%^&*()_+={}[]|\;:"<>,/? ' \
+		   '------------------------------' |
+		tr -s '-' | tr '[A-Z]' '[a-z]' | sed "s/^-*//;s/-*\$//"
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,10 @@ check_output()`
`97`	`97`	`# from front and back.`
`98`	`98`	`name_from_description()`
`99`	`99`	`{`
`100`		- tr "'" '-' \| tr '~`!@#$%^&()_+={}[]\|\;:"<>,/? ' '-' \| tr -s '-' \| tr '[A-Z]' '[a-z]' \| sed "s/^-//;s/-*\$//"
	`100`	`+ tr "'" '-' \|`
	`101`	+ tr '~`!@#$%^&*()_+={}[]\|\;:"<>,/? ' \
	`102`	`+ '------------------------------' \|`
	`103`	`+ tr -s '-' \| tr '[A-Z]' '[a-z]' \| sed "s/^-//;s/-\$//"`
`101`	`104`	`}`
`102`	`105`
`103`	`106`