X-Git-Url: http://git.tuebingen.mpg.de/?p=gsu.git;a=blobdiff_plain;f=subcommand;h=261e35f5e39b6f377529c24a136427106d6301cb;hp=bded36d1514a09a4c3ed61dc72d11095e470d7b8;hb=32134f1512eab90da01e9cfd9f676bffef27a939;hpb=521b9d7584ff363b9af24f33e0afb1e954da854a diff --git a/subcommand b/subcommand index bded36d..261e35f 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]%/*}} @@ -57,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' @@ -68,6 +69,8 @@ _gsu_print_available_commands() printf '\n' } +# Print all options of the given optstring to stdout if the word in the current +# command line begins with a hyphen character. gsu_complete_options() { local opts="$1" cword="$2" cur opt @@ -314,7 +317,7 @@ complete_help() # 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 argument and either the emtpy +# o_x contains true/false for options without argument and either the empty # string or the given argument for options that take an argument. # # Example: @@ -546,6 +549,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 @@ -573,8 +577,7 @@ gsu() # 0 0 no argument allowed # 1 1 exactly one argument required # 0 2 at most two arguments admissible -# 2 at least two arguments reqired -# +# 2 at least two arguments required gsu_check_arg_count() { ret=-$E_GSU_BAD_ARG_COUNT