X-Git-Url: http://git.tuebingen.mpg.de/?p=gsu.git;a=blobdiff_plain;f=funcs%2Fgsu;h=673605e43bbca8e66940722b7c587b72ba84964b;hp=e91970ec14f73d0ec83b1213ea2a232eb49ffb6d;hb=ad6133ac9cea3d873291675a030c1361cd5cf6b9;hpb=e0cc2e967c7aa681258a4918f3d3ca92c5f86483

diff --git a/funcs/gsu b/funcs/gsu
index e91970e..673605e 100644
--- a/funcs/gsu
+++ b/funcs/gsu
@@ -1,6 +1,6 @@
 #!/bin/bash
 # gsu -- the global subcommand utility
-# (C) 2006-2009 Andre Noll
+# (C) 2006-2010 Andre Noll
 
 _gsu_init_errors()
 {
@@ -8,14 +8,14 @@ _gsu_init_errors()
 GSU_SUCCESS			success
 E_GSU_BAD_COMMAND		invalid command
 E_GSU_NOT_A_NUMBER		not a number
-E_GSU_SOURCE			error in config file
-E_GSU_CONFIG			bad/missing config file option
 E_GSU_BAD_CONFIG_VAR		invalid config variable
 E_GSU_NEED_VALUE		value required but not given
 E_GSU_BAD_BOOL			bad value for boolian option
 E_GSU_BAD_OPTION_TYPE		invalid option type
 E_GSU_BAD_ARG_COUNT		invalid number of arguments
-E_NO_DEFAULT			missing default value
+E_GSU_EDITOR			failed to execute editor
+E_GSU_MKDIR			failed to create directory
+E_GSU_GETOPTS			getopts error
 $gsu_errors
 "
 	local a b i=0
@@ -171,13 +171,27 @@ export -f _gsu_print_available_commands
 export gsu_prefs_txt="
 Print the current preferences.
 
-Usage: prefs
+Usage: prefs [-e]
 
-Print out a list of all cmt config variables, together with their current value
-and the default value."
+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()
 {
-	local i
+	local i conf="${gsu_config_file:=$HOME/.$gsu_name.rc}"
+
+	if [[ "$1" = "-e" ]]; then
+		ret=-$E_GSU_MKDIR
+		result="${conf%/*}"
+		mkdir -p "$result"
+		[[ $? -ne 0 ]] && return
+		ret=-$E_GSU_EDITOR
+		result="${EDITOR:-vi}"
+		"$result" "$conf"
+		[[ $? -ne 0 ]] && return
+		ret=$GSU_SUCCESS
+		return
+	fi
 
 	for ((i=0; i < ${#gsu_options[@]}; i++)); do
 		local name= option_type= default_value= required=
@@ -304,7 +318,7 @@ _com_help()
 	fi
 	ret=$GSU_SUCCESS
 	if grep -q "^com_$1()" $0; then
-		sed -e "1,/com_$1()/d" -e '/^{/,$d' -e 's/^## *//' $0
+		sed -e "1,/^com_$1()$/d" -e '/^{/,$d' -e 's/^## *//' $0
 		return
 	fi
 	_gsu_print_available_commands
@@ -384,20 +398,96 @@ _gsu_check_options()
 }
 export -f _gsu_check_options
 
-gsu()
+# Wrapper for bash's getopts.
+#
+# 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.
+#
+# Example:
+# 	gsu_getopts abc:x:y
+# 	eval "$result"
+# 	[[ $ret -lt 0 ]] && return
+#
+# 	[[ "$o_a" = "true ]] && echo "The -a flag was given"
+# 	[[ -n "$o_c" ]] && echo "The -c option was given with arg $o_c"
+gsu_getopts()
 {
-	local i
+	local i c tab='	' cr='
+'
 
-	gsu_is_a_number "${BASH_VERSINFO[0]}"
+	gsu_check_arg_count $# 1 1
 	if [[ $ret -lt 0 ]]; then
-		gsu_msg "fatal: failed to determine bash version"
+		gsu_err_msg
 		exit 1
 	fi
 
-	if [[ "${BASH_VERSINFO[0]}" -lt 4 ]]; then
-		gsu_msg "fatal: This script requires at least bash 4.0"
+	ret=-$E_GSU_GETOPTS
+	result="invalid optstring $1"
+	if [[ -z "$1" || "$1" =~ "::" ]]; then
+		gsu_err_msg
 		exit 1
 	fi
+
+	for ((i=0; i < ${#1}; i++)); do
+		c=${1:$i:1}
+		case "$c" in
+		[a-zA-Z:]);;
+		*)
+			ret=-$E_GSU_GETOPTS
+			result="invalid character $c in optstring"
+			gsu_err_msg
+			exit 1
+		esac
+	done
+	result="local opt"
+	for ((i=0; i < ${#1}; i++)); do
+		c1=${1:$i:1}
+		c2=${1:$(($i + 1)):1}
+		result+=" o_$c1"
+		if [[ "$c2" = ":" ]]; then
+			let i++
+		else
+			result+="=false"
+		fi
+	done
+	result+="
+	OPTIND=1
+	while getopts $1 opt \"\$@\"; do
+		case \"\$opt\" in
+"
+	for ((i=0; i < ${#1}; i++)); do
+		c1=${1:$i:1}
+		c2=${1:$(($i + 1)):1}
+		result+="$tab$tab$c1) o_$c1="
+		if [[ "$c2" = ":" ]]; then
+			result+="\"\$OPTARG\""
+			let i++
+		else
+			result+="true"
+		fi
+		result+=";;$cr"
+	done
+	result+="
+		*)
+			ret=-\$E_GSU_GETOPTS
+			result=\"invalid option given\"
+			return
+			;;
+		esac
+	done
+	shift \$((\$OPTIND - 1))
+"
+	ret=$GSU_SUCCESS
+}
+export -f gsu_getopts
+
+gsu()
+{
+	local i
 	_gsu_self="$(basename $0)"
 	gsu_name="${gsu_name:=$_gsu_self}"
 	gsu_config_var_prefix="${gsu_config_var_prefix:=$gsu_name}"
@@ -432,7 +522,7 @@ gsu()
 	for i in $gsu_cmds; do
 		if test "$arg" = "$i"; then
 			com_$arg "$@"
-			if test $ret -lt 0; then
+			if [[ "$ret" -lt 0 ]]; then
 				gsu_err_msg
 				exit 1
 			fi