diff options
Diffstat (limited to 'completions/psql')
| -rw-r--r-- | completions/psql | 86 |
1 files changed, 43 insertions, 43 deletions
diff --git a/completions/psql b/completions/psql index ceedf07e..4bc6049f 100644 --- a/completions/psql +++ b/completions/psql @@ -4,16 +4,16 @@ _pg_databases() { # -w was introduced in 8.4, https://launchpad.net/bugs/164772 # "Access privileges" in output may contain linefeeds, hence the NF > 1 - COMPREPLY=( $(compgen -W "$(psql -XAtqwlF $'\t' 2>/dev/null | \ - awk 'NF > 1 { print $1 }')" -- "$cur") ) + COMPREPLY=($(compgen -W "$(psql -XAtqwlF $'\t' 2>/dev/null | + awk 'NF > 1 { print $1 }')" -- "$cur")) } _pg_users() { # -w was introduced in 8.4, https://launchpad.net/bugs/164772 - COMPREPLY=( $(compgen -W "$(psql -XAtqwc 'select usename from pg_user' \ - template1 2>/dev/null)" -- "$cur") ) - [[ ${#COMPREPLY[@]} -eq 0 ]] && COMPREPLY=( $(compgen -u -- "$cur") ) + COMPREPLY=($(compgen -W "$(psql -XAtqwc 'select usename from pg_user' \ + template1 2>/dev/null)" -- "$cur")) + ((${#COMPREPLY[@]} == 0)) && COMPREPLY=($(compgen -u -- "$cur")) } # createdb(1) completion @@ -24,29 +24,29 @@ _createdb() _init_completion -s || return case $prev in - --host|-!(-*)h) + --host | -!(-*)h) _known_hosts_real -- "$cur" return ;; - --username|--owner|-!(-*)[UO]) + --username | --owner | -!(-*)[UO]) _pg_users return ;; - --help|--version|--port|--tablespace|--encoding|--template|-!(-*)[pDET]) + --help | --version | --port | --tablespace | --encoding | --template | -!(-*)[pDET]) return ;; esac $split && return - if [[ "$cur" == -* ]]; then - COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") ) - [[ $COMPREPLY == *= ]] && compopt -o nospace + if [[ $cur == -* ]]; then + COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur")) + [[ ${COMPREPLY-} == *= ]] && compopt -o nospace else _pg_databases fi } && -complete -F _createdb createdb + complete -F _createdb createdb # createuser(1) completion # @@ -56,14 +56,14 @@ _createuser() _init_completion -s || return case $prev in - --help|--version|--port|--connection-limit|-!(-*)[pc]) + --help | --version | --port | --connection-limit | -!(-*)[pc]) return ;; - --host|-!(-*)h) + --host | -!(-*)h) _known_hosts_real -- "$cur" return ;; - --username|-!(-*)U) + --username | -!(-*)U) _pg_users return ;; @@ -71,12 +71,12 @@ _createuser() $split && return - if [[ "$cur" == -* ]]; then - COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") ) - [[ $COMPREPLY == *= ]] && compopt -o nospace + if [[ $cur == -* ]]; then + COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur")) + [[ ${COMPREPLY-} == *= ]] && compopt -o nospace fi } && -complete -F _createuser createuser + complete -F _createuser createuser # dropdb(1) completion # @@ -86,29 +86,29 @@ _dropdb() _init_completion -s || return case $prev in - --host|-!(-*)h) + --host | -!(-*)h) _known_hosts_real -- "$cur" return ;; - --username|-!(-*)U) + --username | -!(-*)U) _pg_users return ;; - --help|--version) + --help | --version) return ;; esac $split && return - if [[ "$cur" == -* ]]; then - COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") ) - [[ $COMPREPLY == *= ]] && compopt -o nospace + if [[ $cur == -* ]]; then + COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur")) + [[ ${COMPREPLY-} == *= ]] && compopt -o nospace else _pg_databases fi } && -complete -F _dropdb dropdb + complete -F _dropdb dropdb # dropuser(1) completion # @@ -118,14 +118,14 @@ _dropuser() _init_completion -s || return case $prev in - --help|--version|--port|-!(-*)p) + --help | --version | --port | -!(-*)p) return ;; - --host|-!(-*)h) + --host | -!(-*)h) _known_hosts_real -- "$cur" return ;; - --username|-!(-*)U) + --username | -!(-*)U) _pg_users return ;; @@ -133,14 +133,14 @@ _dropuser() $split && return - if [[ "$cur" == -* ]]; then - COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") ) - [[ $COMPREPLY == *= ]] && compopt -o nospace + if [[ $cur == -* ]]; then + COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur")) + [[ ${COMPREPLY-} == *= ]] && compopt -o nospace else _pg_users fi } && -complete -F _dropuser dropuser + complete -F _dropuser dropuser # psql(1) completion # @@ -150,39 +150,39 @@ _psql() _init_completion -s || return case $prev in - --host|-!(-*)h) + --host | -!(-*)h) _known_hosts_real -- "$cur" return ;; - --username|-!(-*)U) + --username | -!(-*)U) _pg_users return ;; - --dbname|-!(-*)d) + --dbname | -!(-*)d) _pg_databases return ;; - --output|--file|--log-file|-!(-*)[ofL]) + --output | --file | --log-file | -!(-*)[ofL]) _filedir return ;; - --help|--version|--command|--field-separator|--port|--pset|\ - --record-separator|--table-attr|--set|--variable|-!(-*)[?VcFpPRTv]) + --help | --version | --command | --field-separator | --port | --pset | \ + --record-separator | --table-attr | --set | --variable | -!(-*)[?VcFpPRTv]) return ;; esac $split && return - if [[ "$cur" == -* ]]; then + if [[ $cur == -* ]]; then # return list of available options - COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") ) - [[ $COMPREPLY == *= ]] && compopt -o nospace + COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur")) + [[ ${COMPREPLY-} == *= ]] && compopt -o nospace else # return list of available databases _pg_databases fi } && -complete -F _psql psql + complete -F _psql psql # ex: filetype=sh |