From dce179f8a3ac7f6a349deda010c9f811b78c17ce Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Sat, 18 Aug 2012 16:37:55 +0200 Subject: simplier completion --- completion/bash-completion.sh | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) (limited to 'completion/bash-completion.sh') diff --git a/completion/bash-completion.sh b/completion/bash-completion.sh index 26e1134..11b99ea 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" ]; then + ponies=$('/usr/bin/ponysay.py' --onelist) + COMPREPLY=( $( compgen -W "$ponies" -- "$cur" ) ) + + elif [ $prev = "-q" ]; then + quoters=$('/usr/bin/ponysay.py' --quoters) + COMPREPLY=( $( compgen -W "$quoters" -- "$cur" ) ) elif [ $prev = "-W" ]; 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 } -- cgit From afcc9dc82981e6b334e5b4d8e79e19925ca9600e Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Sun, 19 Aug 2012 03:30:11 +0200 Subject: info update + bash completion improvement (long options are suggested) --- completion/bash-completion.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'completion/bash-completion.sh') diff --git a/completion/bash-completion.sh b/completion/bash-completion.sh index 11b99ea..ca6755e 100644 --- a/completion/bash-completion.sh +++ b/completion/bash-completion.sh @@ -8,15 +8,15 @@ _ponysay() options='-v -h -l -f -W -q' COMPREPLY=( $( compgen -W "$options" -- "$cur" ) ) - if [ $prev = "-f" ]; then + if [ $prev = "-f" ] || [ $prev = "--pony" ]; then ponies=$('/usr/bin/ponysay.py' --onelist) COMPREPLY=( $( compgen -W "$ponies" -- "$cur" ) ) - elif [ $prev = "-q" ]; then + elif [ $prev = "-q" ] || [ $prev = "--quote" ]; then quoters=$('/usr/bin/ponysay.py' --quoters) COMPREPLY=( $( compgen -W "$quoters" -- "$cur" ) ) - elif [ $prev = "-W" ]; then + elif [ $prev = "-W" ] || [ $prev = "--wrap" ]; then cols=$(( `stty size | cut -d ' ' -f 2` - 10 )) COMPREPLY=( $cols $(( $cols / 2 )) 100 60 ) -- cgit