X-Git-Url: http://git.tuebingen.mpg.de/?p=gsu.git;a=blobdiff_plain;f=subcommand;h=5e55580013dad9ec224e8c11a8e191b18c00428e;hp=13e3d83ab082707e3555d435999f1510e1d9d4f1;hb=14bfd7f2bb19c802a5251d4d4289ecd77c8d24ed;hpb=99d118192790970e4ce38f088797337c8316a169 diff --git a/subcommand b/subcommand index 13e3d83..5e55580 100644 --- a/subcommand +++ b/subcommand @@ -100,7 +100,7 @@ gsu_getopts() ' gsu_check_arg_count $# 1 1 - if (($ret < 0)); then + if ((ret < 0)); then gsu_err_msg exit 1 fi @@ -126,7 +126,7 @@ gsu_getopts() result="local _gsu_getopts_opt" for ((i=0; i < ${#1}; i++)); do c1=${1:$i:1} - c2=${1:$(($i + 1)):1} + c2=${1:$((i + 1)):1} result+=" o_$c1=" if [[ "$c2" = ":" ]]; then let i++ @@ -141,7 +141,7 @@ gsu_getopts() " for ((i=0; i < ${#1}; i++)); do c1=${1:$i:1} - c2=${1:$(($i + 1)):1} + c2=${1:$((i + 1)):1} result+="$tab$tab$c1) o_$c1=" if [[ "$c2" = ":" ]]; then result+="\"\$OPTARG\"" @@ -175,7 +175,7 @@ _gsu_print_available_commands() for cmd in $cmds; do printf '%s' "$cmd" let ++count - if (($count % 4)); then + if ((count % 4)); then printf '\t' ((${#cmd} < 8)) && printf '\t' else @@ -226,9 +226,9 @@ com_prefs() gsu_getopts "$com_prefs_options" eval "$result" - (($ret < 0)) && return + ((ret < 0)) && return gsu_check_arg_count $# 0 0 - (($ret < 0)) && return + ((ret < 0)) && return if [[ "$o_e" == "true" ]]; then ret=-$E_GSU_MKDIR @@ -595,7 +595,7 @@ com_man() _gsu_available_commands for com in $result; do num=${#com} - (($num < 4)) && num=4 + ((num < 4)) && num=4 echo "${minus_signs:0:$num}" echo "$com" echo "${minus_signs:0:$num}" @@ -749,8 +749,8 @@ EOF cword="$1" gsu_is_a_number "$cword" - (($ret < 0)) && return - if (($cword <= 1)); then + ((ret < 0)) && return + if ((cword <= 1)); then _gsu_available_commands echo "${result}" ret=$GSU_SUCCESS @@ -783,18 +783,18 @@ gsu_cword_is_option_parameter() local -a words result= - (($cword == 0)) && return + ((cword == 0)) && return ((${#opts} < 2)) && return shift 2 words=("$@") - prev="${words[$(($cword - 1))]}" + prev="${words[$((cword - 1))]}" [[ ! "$prev" == -* ]] && return n=$((${#opts} - 1)) for ((i=0; i <= $n; i++)); do opt="${opts:$i:1}" - [[ "${opts:$(($i + 1)):1}" != ":" ]] && continue + [[ "${opts:$((i + 1)):1}" != ":" ]] && continue let i++ [[ ! "$prev" =~ ^-.*$opt$ ]] && continue result="$opt" @@ -825,13 +825,13 @@ gsu_get_unnamed_arg_num() shift 2 words=("$@") cur="${words[$cword]}" - prev="${words[$(($cword - 1))]}" + prev="${words[$((cword - 1))]}" result=-1 [[ "$cur" == -* ]] && return [[ "$prev" == -* ]] && [[ "$opts" == *${prev#-}:* ]] && return for ((i=1; i <= $cword; i++)); do - prev="${words[$(($i - 1))]}" + prev="${words[$((i - 1))]}" cur="${words[$i]}" [[ "$cur" == -* ]] && continue if [[ "$prev" == -* ]]; then @@ -841,7 +841,7 @@ gsu_get_unnamed_arg_num() fi let n++ done - result="$(($n - 1))" + result="$((n - 1))" } # Entry point for all gsu-based scripts. @@ -872,7 +872,7 @@ gsu() shift if [[ "$(type -t "com_$arg")" == 'function' ]]; then "com_$arg" "$@" - if (("$ret" < 0)); then + if ((ret < 0)); then gsu_err_msg exit 1 fi