X-Git-Url: http://git.tuebingen.mpg.de/?p=gsu.git;a=blobdiff_plain;f=funcs%2Fgsu;h=63e0acf7dfb705047efb1f4809c9af3282fbe9a3;hp=3f7d379ffcf3867b2c07a660626db17ca2b5cb9a;hb=c54761ffae2f3fd24db97a447a6db5d90959a1d6;hpb=afd291e6abcc04c56221507ff9b06f0eaca111b6;ds=sidebyside

diff --git a/funcs/gsu b/funcs/gsu
index 3f7d379..63e0acf 100644
--- a/funcs/gsu
+++ b/funcs/gsu
@@ -1,6 +1,6 @@
 #!/bin/bash
 # gsu -- the global subcommand utility
-# (C) 2006-2010 Andre Noll
+# (C) 2006-2011 Andre Noll
 
 _gsu_init_errors()
 {
@@ -137,13 +137,16 @@ _gsu_usage()
 }
 export -f _gsu_usage
 
+# Each line matching this is recognized as a subcommand. The name
+# of the subcommand is the first subexpression.
+export gsu_command_regex='^com_\([a-zA-Z_0-9]\+\)()'
+
 _gsu_available_commands()
 {
-	result="$( (printf "help\nman\nprefs\n"; grep "^com_[a-z_]\+()" $0) \
-		| sed -e 's/^com_//' -e 's/()//' \
-		| sort \
-		| tr '\n' ' ')"
-	ret=$GSU_SUCCESS
+	result="$({
+		printf "help\nman\nprefs\n"
+		sed -ne "s/$gsu_command_regex/\1/g;T;p" $0
+		} | sort | tr '\n' ' ')"
 }
 export -f _gsu_available_commands
 
@@ -281,13 +284,13 @@ _com_help()
 			printf "com_help()\n$gsu_help_txt" | head -n 4; echo "--"
 			printf "com_man()\n$gsu_man_txt" | head -n 4; echo "--"
 			printf "com_prefs()\n$gsu_prefs_txt" | head -n 4; echo "--"
-			grep -A 2 "^com_\([a-zA-Z_0-9]\+\)()" $0
+			grep -A 2 "$gsu_command_regex" $0
 		} | grep -v -- '--' \
-			| sed -e '/^com_\([a-zA-Z_0-9]\+\)()/bs' \
+			| sed -e "/$gsu_command_regex/bs" \
 				-e 'H;$!d;x;s/\n//g;b' \
 				-e :s \
 				-e 'x;s/\n//g;${p;x;}' \
-			| sed -e 's/^com_\([a-zA-Z_0-9]\+\)()#*/\1\t/' \
+			| sed -e "s/${gsu_command_regex}#*/\1\t/" \
 			| sort \
 			| while read a b; do
 				printf "$a\t"