X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=misc%2Fgsu%2Fsubcommand;h=3a1bc6db6697c7a0676a45ae940b930d18ee8901;hb=844b7a202a39530d00aa191bae9e3d4189b89049;hp=911179eb45eb57590dbb0b4f4f484e2ecb86f2c5;hpb=c2d03a6157867608fe2daef1c8bbfc3d727c0d72;p=gsu.git

diff --git a/misc/gsu/subcommand b/misc/gsu/subcommand
index 911179e..3a1bc6d 100644
--- a/misc/gsu/subcommand
+++ b/misc/gsu/subcommand
@@ -62,7 +62,7 @@ _gsu_print_available_commands()
 
 gsu_complete_options()
 {
-	local opts="$1" cword="$2" cur
+	local opts="$1" cword="$2" cur opt
 	local -a words
 
 	shift 2
@@ -115,7 +115,7 @@ _com_prefs()
 		local name= option_type= default_value= required=
 		local description= help_text=
 		eval "${gsu_options[$i]}"
-		eval val='"$'${gsu_config_var_prefix}_$name'"'
+		eval val='"${'${gsu_config_var_prefix}_$name:-'}"'
 		case "$required" in
 		true|yes)
 			printf "# required"
@@ -186,13 +186,7 @@ _com_man()
 
 _gsu_banner_msg()
 {
-	local txt="### $_gsu_self --"
-	if test -z "$gsu_banner_txt"; then
-		txt="$txt set \$gsu_banner_txt to customize this message"
-	else
-		txt="$txt $gsu_banner_txt"
-	fi
-	gsu_short_msg "$txt ###"
+	gsu_short_msg "### $_gsu_self -- ###"
 }
 
 export gsu_help_txt="
@@ -208,11 +202,13 @@ Command line completion.
 
 Usage: complete [<cword> <word>...]
 
-In the first form, the command prints all possible completions to stdout.
-This can be used from the completion function of the shell.
+When executed without argument the command writes bash code to
+stdout. This code is suitable to be evaled from .bashrc to enable
+completion.
 
-Completion code suitable to be evaled is written to stdout if no argument
-was given.
+If at least one argument is given, all possible completions are
+written to stdout. This can be used from the completion function of
+the subcommand.
 "
 
 _com_help()
@@ -312,21 +308,20 @@ complete_help()
 	echo "$result"
 }
 
-# Wrapper for bash's getopts.
+# Wrapper for the bash getopts builtin.
 #
 # 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 an argument or the emtpy string/the
-# given argument, depending on whether this option was contained in the "$@"
-# array.
+# o_x contains true/false for options without argument and either the emtpy
+# string or the given argument for options that take an argument.
 #
 # Example:
 # 	gsu_getopts abc:x:y
 # 	eval "$result"
-# 	[[ $ret -lt 0 ]] && return
+# 	(($ret < 0)) && return
 #
-# 	[[ "$o_a" = "true ]] && echo "The -a flag was given"
+# 	[[ "$o_a" = 'true' ]] && echo 'The -a flag was given'
 # 	[[ -n "$o_c" ]] && echo "The -c option was given with arg $o_c"
 gsu_getopts()
 {
@@ -400,7 +395,7 @@ gsu_getopts()
 
 _com_complete()
 {
-	local cmd n cword="$1"
+	local cmd n cword
 	local -a words
 
 	if (($# == 0)); then
@@ -411,9 +406,13 @@ _com_complete()
 		candidates=(\$($0 complete "\$COMP_CWORD" "\${COMP_WORDS[@]}"));
 		COMPREPLY=(\$(compgen -W "\${candidates[*]}" -- "\$cur"));
 EOF
+		ret=$GSU_SUCCESS
+		return
 	fi
 
-	[[ -z "$cword" ]] && return
+	cword="$1"
+	gsu_is_a_number "$cword"
+	(($ret < 0)) && return
 	if (($cword <= 1)); then
 		_gsu_available_commands
 		echo "${result}"
@@ -430,6 +429,15 @@ EOF
 	ret=$GSU_SUCCESS
 }
 
+# Find out if the current word is a parameter for an option.
+#
+# $1:   usual getopts option string.
+# $2:   The current word number.
+# $3..: All words of the current command line.
+#
+# return: If yes, $result contains the letter of the option for which the
+# current word is a parameter. Otherwise, $result is empty.
+#
 gsu_cword_is_option_parameter()
 {
 	local opts="$1" cword="$2" prev i n
@@ -445,7 +453,7 @@ gsu_cword_is_option_parameter()
 	[[ ! "$prev" == -* ]] && return
 
 	n=$((${#opts} - 1))
-	for ((i=0; i < $n; i++)); do
+	for ((i=0; i <= $n; i++)); do
 		opt="${opts:$i:1}"
 		[[ "${opts:$(($i + 1)):1}" != ":" ]] && continue
 		let i++
@@ -456,6 +464,47 @@ gsu_cword_is_option_parameter()
 	ret=0
 }
 
+# Get the word number on which the cursor is, not counting options.
+#
+# This is useful for completing commands whose possible completions depend
+# on the word number, for example mount.
+#
+# $1:   Getopt option string.
+# $2:   The current word number.
+# $3..: All words of the current command line.
+#
+# return: If the current word is an option, or a parameter to an option,
+# this function sets $result to -1. Otherwise, the number of the non-option
+# is returned in $result.
+#
+gsu_get_unnamed_arg_num()
+{
+	local opts="$1" cword="$2" prev cur
+	local -i i n=0
+	local -a words
+
+	shift 2
+	words=("$@")
+	cur="${words[$cword]}"
+	prev="${words[$(($cword - 1))]}"
+	result=-1
+	[[ "$cur" == -* ]] && return
+	[[ "$prev" == -* ]] && [[ "$opts" == *${prev#-}:* ]] && return
+
+	for ((i=1; i <= $cword; i++)); do
+		prev="${words[$(($i - 1))]}"
+		cur="${words[$i]}"
+		[[ "$cur" == -* ]] && continue
+		if [[ "$prev" == -* ]]; then
+			opt=${prev#-}
+			[[ "$opts" != *$opt:* ]] && let n++
+			continue
+		fi
+		let n++
+	done
+	result="$(($n - 1))"
+}
+
 gsu()
 {
 	local i