X-Git-Url: http://git.tuebingen.mpg.de/?p=gsu.git;a=blobdiff_plain;f=subcommand;h=343f248ea45a07411fa61a576532b5566a2bf9b1;hp=ca546bd1617074d86813135f54c9dc2f7f7e5873;hb=71610bcb63f7e3d4bf33a8e766cad5d9b8f74acc;hpb=692f2f3c9dfd6a1d6692e6f131e4e40c02f7f1bc

diff --git a/subcommand b/subcommand
index ca546bd..343f248 100644
--- a/subcommand
+++ b/subcommand
@@ -52,11 +52,13 @@ _gsu_available_commands()
 
 _gsu_print_available_commands()
 {
-	local cmd
+	local cmd cmds
 	local -i count=0
 
+	_gsu_available_commands
+	cmds="$result"
 	printf 'Available commands:\n'
-	for cmd in $gsu_cmds; do
+	for cmd in $cmds; do
 		printf '%s' "$cmd"
 		let ++count
 		if (($count % 4)); then
@@ -91,19 +93,23 @@ gsu_complete_options()
 	done
 }
 
+com_prefs_options='e'
+
 export gsu_prefs_txt="
 Print the current preferences.
 
 Usage: prefs [-e]
 
-If -e is given, the config file is opened with the default editor.  Without
-options, the command prints out a list of all cmt config variables, together
-with their current value and the default value."
-_com_prefs()
+If -e is given, the config file is opened with the default editor.
+Without options, the command prints out a list of all config variables,
+together with their current value and the default value.
+"
+
+com_prefs()
 {
 	local i conf="${gsu_config_file:=${HOME:-}/.$gsu_name.rc}"
 
-	gsu_getopts "e"
+	gsu_getopts "$com_prefs_options"
 	eval "$result"
 	(($ret < 0)) && return
 	gsu_check_arg_count $# 0 0
@@ -149,7 +155,7 @@ _com_prefs()
 
 complete_prefs()
 {
-	gsu_complete_options "e" "$@"
+	gsu_complete_options "$com_prefs_options" "$@"
 }
 
 export gsu_man_txt="
@@ -157,19 +163,20 @@ Print the manual.
 
 Usage: man"
 
-_com_man()
+
+com_man()
 {
 	local equal_signs="=================================================="
 	local minus_signs="--------------------------------------------------"
-        local com num
+	local com num
 
 	echo "$gsu_name (_${gsu_banner_txt}_) manual"
 	echo "${equal_signs:0:${#gsu_name} + ${#gsu_banner_txt} + 16}"
 	echo
 
-        sed -e '1,/^#\{70,\}/d' -e '/^#\{70,\}/,$d' $0 -e 's/^# *//'
+	sed -e '1,/^#\{70,\}/d' -e '/^#\{70,\}/,$d' $0 -e 's/^# *//'
 	echo "----"
-        echo
+	echo
 	echo "$gsu_name usage"
 	echo "${minus_signs:0:${#gsu_name} + 6}"
 	printf "\t"
@@ -181,16 +188,16 @@ _com_man()
 	echo "Available commands:"
 
 	_gsu_available_commands
-        for com in $result; do
+	for com in $result; do
 		num=${#com}
 		(($num < 4)) && num=4
-                echo "${minus_signs:0:$num}"
-                echo "$com"
-                echo "${minus_signs:0:$num}"
-                $0 help $com
+		echo "${minus_signs:0:$num}"
+		echo "$com"
+		echo "${minus_signs:0:$num}"
+		$0 help $com
 		echo
-        done
-        ret=$GSU_SUCCESS
+	done
+	ret=$GSU_SUCCESS
 }
 
 export gsu_help_txt="
@@ -215,7 +222,7 @@ written to stdout. This can be used from the completion function of
 the subcommand.
 "
 
-_com_help()
+com_help()
 {
 	local a b ere tab='	'
 
@@ -397,7 +404,7 @@ gsu_getopts()
 	ret=$GSU_SUCCESS
 }
 
-_com_complete()
+com_complete()
 {
 	local cmd n cword
 	local -a words
@@ -527,8 +534,7 @@ gsu_get_unnamed_arg_num()
 gsu()
 {
 	local i
-	_gsu_available_commands
-	gsu_cmds="$result"
+
 	if (($# == 0)); then
 		_gsu_usage
 		_gsu_print_available_commands
@@ -536,29 +542,14 @@ gsu()
 	fi
 	arg="$1"
 	shift
-	# check internal commands
-	if [[ "$arg" = "help" || "$arg" = "man" || "$arg" = "prefs" || "$arg" = "complete" ]]; then
-		_com_$arg "$@"
+	if [[ "$(type -t com_$arg)" == 'function' ]]; then
+		com_$arg "$@"
 		if (("$ret" < 0)); then
 			gsu_err_msg
 			exit 1
 		fi
 		exit 0
 	fi
-
-	# external commands
-	for i in $gsu_cmds; do
-		if test "$arg" = "$i"; then
-			ret=$GSU_SUCCESS
-			com_$arg "$@"
-			if (("$ret" < 0)); then
-				gsu_err_msg
-				exit 1
-			fi
-			exit 0
-		fi
-	done
-
 	ret=-$E_GSU_BAD_COMMAND
 	result="$arg"
 	gsu_err_msg