X-Git-Url: http://git.tuebingen.mpg.de/?p=gsu.git;a=blobdiff_plain;f=subcommand;h=198ce164f5595ec3fd607b394b28d7ec99a9f349;hp=9ebb7eef06d585138d05ecd6d20c8e64e3a5c0fb;hb=de1b465459cce24580fc979a9448fb0f71245c11;hpb=77fd8c08604bb7a1c641c4f36bdf4f839d114656 diff --git a/subcommand b/subcommand index 9ebb7ee..198ce16 100644 --- a/subcommand +++ b/subcommand @@ -25,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)\(\)" } @@ -58,7 +58,7 @@ _gsu_print_available_commands() printf 'Available commands:\n' for cmd in $gsu_cmds; do printf '%s' "$cmd" - let count++ + let ++count if (($count % 4)); then printf '\t' ((${#cmd} < 8)) && printf '\t' @@ -96,9 +96,10 @@ 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." +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}" @@ -161,15 +162,15 @@ _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 +182,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=" @@ -549,6 +550,7 @@ gsu() # 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