X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=subcommand;h=1e04d16c8f047b59105e5bf614070295f73fb0da;hb=769dc36ab2a5961568474be1e31264418d44dbfc;hp=95e0ba9ebbc48aa5f8753d2e8fc42d8e594a26b7;hpb=545f2b7b22c800fd4645e5784cd35a318d2e60d6;p=gsu.git

diff --git a/subcommand b/subcommand
index 95e0ba9..1e04d16 100644
--- a/subcommand
+++ b/subcommand
@@ -50,25 +50,26 @@ _gsu_available_commands()
 }
 
 _gsu_print_available_commands()
-{(
-	local i count=0
-	gsu_short_msg "Available commands:"
-	for i in $gsu_cmds; do
-		printf "$i"
-		count=$(($count + 1))
-		if test $(($count % 4)) -eq 0; then
-			echo
+{
+	local cmd
+	local -i count=0
+
+	printf 'Available commands:\n'
+	for cmd in $gsu_cmds; do
+		printf '%s' "$cmd"
+		let count++
+		if (($count % 4)); then
+			printf '\t'
+			((${#cmd} < 8)) && printf '\t'
 		else
-			printf "\t"
-			if test ${#i} -lt 8; then
-				printf "\t"
-			fi
+			printf '\n'
 		fi
 	done
-	echo
-) 2>&1
+	printf '\n'
 }
 
+# Print all options of the given optstring to stdout if the word in the current
+# command line begins with a hyphen character.
 gsu_complete_options()
 {
 	local opts="$1" cword="$2" cur opt
@@ -315,7 +316,7 @@ complete_help()
 # Aborts on programming errors such as missing or invalid option string.  On
 # success $result contains shell code that can be eval'ed. For each defined
 # option x, the local variable o_x will be created when calling eval "$result".
-# o_x contains true/false for options without argument and either the emtpy
+# o_x contains true/false for options without argument and either the empty
 # string or the given argument for options that take an argument.
 #
 # Example:
@@ -574,8 +575,7 @@ gsu()
 # 	0 0 no argument allowed
 # 	1 1 exactly one argument required
 # 	0 2 at most two arguments admissible
-# 	2   at least two arguments reqired
-#
+# 	2   at least two arguments required
 gsu_check_arg_count()
 {
 	ret=-$E_GSU_BAD_ARG_COUNT