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

diff --git a/subcommand b/subcommand
index 1e04d16..a9d388b 100644
--- a/subcommand
+++ b/subcommand
@@ -1,5 +1,6 @@
 #!/bin/bash
-# (C) 2006-2011 Andre Noll
+# Copyright (C) 2006 Andre Noll
+# Licensed under the LGPL, version 3. See COPYING and COPYING.LESSER.
 
 if [[ "$(type -t _gsu_setup)" != "function" ]]; then
 	gsu_dir=${gsu_dir:-${BASH_SOURCE[0]%/*}}
@@ -24,7 +25,7 @@ _gsu_usage()
 # exactly one parenthesized subexpression for matching the command name.
 _gsu_get_command_regex()
 {
-	local cmd="${1:-[-a-zA-Z_0-9]+}"
+	local cmd="${1:-[-a-zA-Z_0-9]{1,\}}"
 	result="^com_($cmd)\(\)"
 }
 
@@ -51,13 +52,15 @@ _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++
+		let ++count
 		if (($count % 4)); then
 			printf '\t'
 			((${#cmd} < 8)) && printf '\t'
@@ -95,10 +98,12 @@ 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}"
 
@@ -156,19 +161,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"
@@ -180,16 +186,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="
@@ -214,7 +220,7 @@ written to stdout. This can be used from the completion function of
 the subcommand.
 "
 
-_com_help()
+com_help()
 {
 	local a b ere tab='	'
 
@@ -396,7 +402,7 @@ gsu_getopts()
 	ret=$GSU_SUCCESS
 }
 
-_com_complete()
+com_complete()
 {
 	local cmd n cword
 	local -a words
@@ -526,8 +532,7 @@ gsu_get_unnamed_arg_num()
 gsu()
 {
 	local i
-	_gsu_available_commands
-	gsu_cmds="$result"
+
 	if (($# == 0)); then
 		_gsu_usage
 		_gsu_print_available_commands
@@ -535,28 +540,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
-			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