Merge

1 files changed, 4 insertions, 27 deletions

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