aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElis Axelsson <elis.axelsson@gmail.com>2012-07-19 21:28:35 +0200
committerElis Axelsson <elis.axelsson@gmail.com>2012-07-19 21:28:35 +0200
commit1334d466b56520d5889b373c634ef4e902dcfa80 (patch)
tree584ad81d79da9095e6027be6dea269a5d812baf2
parent9820d208a1264666e29d94072a64e1e50f0aeaa4 (diff)
downloadponysay-1334d466b56520d5889b373c634ef4e902dcfa80.tar.gz
ponysay-1334d466b56520d5889b373c634ef4e902dcfa80.tar.bz2
ponysay-1334d466b56520d5889b373c634ef4e902dcfa80.zip
Made the fish-completion aware of the ttyponies, and cleaned it up
-rw-r--r--completion/fish-completion.fish22
1 files changed, 17 insertions, 5 deletions
diff --git a/completion/fish-completion.fish b/completion/fish-completion.fish
index ea98382..8d3c911 100644
--- a/completion/fish-completion.fish
+++ b/completion/fish-completion.fish
@@ -4,21 +4,33 @@
#
# 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 /usr/share/ponysay/ponies/
- set -g systemponies (ls --color=no /usr/share/ponysay/ponies/ | sed 's/\.pony/\t Pony from \/usr\/share\/ponysay\/ponies\//')
+if test -d $systempath
+ set -g systemponies (ls --color=no $systempath | sed 's/\.pony//')
end
-if test -d ~/.local/share/ponysay/ponies/
- set -g homeponies (ls --color=no ~/.local/share/ponysay/ponies/ | sed 's/\.pony/\t Pony from ~\/.local\/share\/ponysay\/ponies\//')
+if test -d $homepath
+ set -g homeponies (ls --color=no $homepath | sed 's/\.pony//')
end
+
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 f -a "$systemponies $homeponies" --description "Select a pony, either a filename or pony name"
+complete -c ponysay -s f -a "$homeponies $systemponies" --description "Ponyfile"
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