X-Git-Url: http://git.kaliko.me/?a=blobdiff_plain;f=data%2Fbash%2Fcompletion.sh;h=2940cb7b1fca669c2c88096c9e0adbe4e1e29a45;hb=8c72e63ba4d41c4d9722ddff3c000de314ff66dc;hp=d1d6b64b4214dc83510a7cff24c0bfdb3097694a;hpb=b61b2c447297e50db76b73650065caeef0cb6f98;p=mpd-sima.git diff --git a/data/bash/completion.sh b/data/bash/completion.sh index d1d6b64..2940cb7 100644 --- a/data/bash/completion.sh +++ b/data/bash/completion.sh @@ -33,7 +33,8 @@ _sima() { -S --host \ -P --port \ -h --help --version \ - --var_dir \ + --var-dir \ + --generate-config \ -d --daemon" if [[ ${cur} == -* || ${COMP_CWORD} -eq 1 ]] ; then @@ -42,7 +43,7 @@ _sima() { fi case "${prev}" in - --var_dir) + --var-dir) _filedir -d ;; -v|--log-level) @@ -54,11 +55,11 @@ _sima() { -c|--config) _filedir if [ -z $XDG_DATA_HOME ]; then - local confnames=$(for x in $(ls -1 $HOME/.config/mpd_sima/*.cfg 2>/dev/null) ; do echo "${x##*//}"; done) + local confnames=$(for x in $(ls -1 $HOME/.config/mpd_sima/*.cfg $PWD/*.cfg 2>/dev/null) ; do echo "${x##*//}"; done) else - local confnames=$(for x in $(ls -1 $HOME/.config/mpd_sima/*.cfg $XDG_DATA_HOME/mpd_sima/*.cfg 2>/dev/null) ; do echo "${x##*//}"; done) + local confnames=$(for x in $(ls -1 $HOME/.config/mpd_sima/*.cfg $XDG_DATA_HOME/mpd_sima/*.cfg $PWD/*.cfg 2>/dev/null) ; do echo "${x##*//}"; done) fi - COMPREPLY+=( $(compgen -W "${confnames}") ) + COMPREPLY+=( $(compgen -W "${confnames}" -- ${cur} ) ) return 0 ;; --host|-S)