diff options
| author | Mattias Andrée <maandree@operamail.com> | 2012-08-19 19:52:39 +0200 |
|---|---|---|
| committer | Mattias Andrée <maandree@operamail.com> | 2012-08-19 19:52:39 +0200 |
| commit | 4774e74ba0af1d1716b832c31e3bf31aed305e4b (patch) | |
| tree | a2d2b4fb14895486c04262da022d4bdea7acd7d6 /completion/bash-completion.sh | |
| parent | f763439803559312cd57835d5fc714a963b1788a (diff) | |
| parent | 64b726770a07a0e04bcec3cf8ab23af4bcc2332f (diff) | |
| download | ponysay-4774e74ba0af1d1716b832c31e3bf31aed305e4b.tar.gz ponysay-4774e74ba0af1d1716b832c31e3bf31aed305e4b.tar.bz2 ponysay-4774e74ba0af1d1716b832c31e3bf31aed305e4b.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'completion/bash-completion.sh')
| -rw-r--r-- | completion/bash-completion.sh | 26 |
1 files changed, 8 insertions, 18 deletions
diff --git a/completion/bash-completion.sh b/completion/bash-completion.sh index 26e1134..ca6755e 100644 --- a/completion/bash-completion.sh +++ b/completion/bash-completion.sh @@ -8,28 +8,18 @@ _ponysay() options='-v -h -l -f -W -q' COMPREPLY=( $( compgen -W "$options" -- "$cur" ) ) - if [ $prev = "-f" ]; then - COMPREPLY=() - - sysponies=/usr/share/ponysay/ponies/ - usrponies=~/.local/share/ponysay/ponies/ - if [[ $TERM = "linux" ]]; then - sysponies=/usr/share/ponysay/ttyponies/ - usrponies=~/.local/share/ponysay/ttyponies/ - fi - - [ -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" ) ) + if [ $prev = "-f" ] || [ $prev = "--pony" ]; then + ponies=$('/usr/bin/ponysay.py' --onelist) + COMPREPLY=( $( compgen -W "$ponies" -- "$cur" ) ) - elif [ $prev = "-W" ]; then + elif [ $prev = "-q" ] || [ $prev = "--quote" ]; then + quoters=$('/usr/bin/ponysay.py' --quoters) + COMPREPLY=( $( compgen -W "$quoters" -- "$cur" ) ) + + elif [ $prev = "-W" ] || [ $prev = "--wrap" ]; then cols=$(( `stty size | cut -d ' ' -f 2` - 10 )) COMPREPLY=( $cols $(( $cols / 2 )) 100 60 ) - elif [ $prev = "-q" ]; then - qcmd=/usr/lib/ponysay/pq4ps - quoters=$($qcmd -l) - COMPREPLY=( $( compgen -W "$quoters" -- "$cur" ) ) - fi } |