Merge branch 'develop'

This commit is contained in:
Mattias Andrée 2012-08-18 03:54:39 +02:00
commit a809144674
2 changed files with 20 additions and 11 deletions

View file

@ -8,7 +8,7 @@ _ponysay()
options='-v -h -l -f -W -q'
COMPREPLY=( $( compgen -W "$options" -- "$cur" ) )
if [[ $prev = "-f" ]]; then
if [ $prev = "-f" ]; then
COMPREPLY=()
sysponies=/usr/share/ponysay/ponies/
@ -18,17 +18,18 @@ _ponysay()
usrponies=~/.local/share/ponysay/ttyponies/
fi
if [[ -d $sysponies ]]; then
COMPREPLY+=( $( compgen -W "$(ls --color=no $sysponies | sed -e 's/.pony//g')" -- "$cur" ) )
fi
if [[ -d $usrponies ]]; then
COMPREPLY+=( $( compgen -W "$(ls --color=no $usrponies | sed -e 's/.pony//g')" -- "$cur" ) )
fi
elif [[ $prev = "-W" ]]; then
[ -d $sysponies ] && COMPREPLY+=( $( compgen -W "$(ls --color=no $sysponies | sed -e 's/.pony//g')" -- "$cur" ) )
[ -d $usrponies ] && COMPREPLY+=( $( compgen -W "$(ls --color=no $usrponies | sed -e 's/.pony//g')" -- "$cur" ) )
elif [ $prev = "-W" ]; then
cols=$(( `stty size | cut -d ' ' -f 2` - 10 ))
COMPREPLY=( $cols $(( $cols / 2 )) 100 60 )
elif [[ $prev = "-q" ]]; then
COMPREPLY=( $( compgen -W "$quotes" -- "$cur" ) )
elif [ $prev = "-q" ]; then
qcmd=/usr/lib/ponysay/pq4ps
quoters=$($qcmd -l)
COMPREPLY=( $( compgen -W "$quoters" -- "$cur" ) )
fi
}

View file

@ -21,17 +21,25 @@ if test -d $homepath
end
set -g qcmd /usr/lib/ponysay/pq4ps
set -g quoters ($qcmd -l)
complete -c ponysay -s h --description "Help of ponysay"
complete -c ponysay -s v --description "Version of ponysay"
complete -c ponysay -s l --description "List pony files"
complete -c ponysay -s L --description "List pony files with alternatives"
complete -c ponysay -s f -a "$homeponies $systemponies" --description "Select a pony"
complete -c ponysay -s q -a "$homeponies $systemponies" --description "Select ponies for MLP:FiM quotes"
complete -c ponysay -s q -a "$quoters" --description "Select ponies for MLP:FiM quotes"
complete -c ponysay -s W -a "Integer" --description "The screen column where the message should be wrapped"
set -e systempath
set -e homepath
set -e systemponies
set -e homeponies
set -e qcmd
set -e quoters