From dce179f8a3ac7f6a349deda010c9f811b78c17ce Mon Sep 17 00:00:00 2001
From: Mattias Andrée <maandree@operamail.com>
Date: Sat, 18 Aug 2012 16:37:55 +0200
Subject: simplier completion

---
 completion/bash-completion.sh   | 24 +++++++-----------------
 completion/fish-completion.fish | 31 ++++---------------------------
 2 files changed, 11 insertions(+), 44 deletions(-)

(limited to 'completion')

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
 }
 
diff --git a/completion/fish-completion.fish b/completion/fish-completion.fish
index 89f7a19..727460b 100644
--- a/completion/fish-completion.fish
+++ b/completion/fish-completion.fish
@@ -3,43 +3,20 @@
 #
 # Author: Elis Axelsson <etu AT elis DOT nu>
 
-if test $TERM = "linux"
-	set -g systempath /usr/share/ponysay/ttyponies/
-	set -g homepath   ~/.local/share/ponysay/ttyponies/
-else
-	set -g systempath /usr/share/ponysay/ponies/
-	set -g homepath   ~/.local/share/ponysay/ponies/
-end
 
-
-if test -d $systempath
-	set -g systemponies (ls --color=no $systempath | sed -e 's/\.pony//' -e 's/_.*//' | perl -pe 's/([a-z])([A-Z])/\1\\\ \2/' )
-end
-
-if test -d $homepath
-	set -g homeponies   (ls --color=no $homepath   | sed -e 's/\.pony//' -e 's/_.*//' | perl -pe 's/([a-z])([A-Z])/\1\\\ \2/' )
-end
-
-
-set -g qcmd    /usr/lib/ponysay/pq4ps
-set -g quoters ($qcmd -l)
+set -g ponies  ('/usr/bin/ponysay.pl' --onelist)
+set -g quoters ('/usr/bin/ponysay.pl' --quoters)
 
 
 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 f -a "$ponies" --description "Select a pony"
 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 ponies
 set -e quoters
 
-- 
cgit