aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMattias Andrée <maandree@operamail.com>2012-07-19 22:05:59 +0200
committerMattias Andrée <maandree@operamail.com>2012-07-19 22:05:59 +0200
commite12021971dd1eb20ba58c0aaf65412dba0c7d6ca (patch)
tree8bdd28ef899dabbfe6629282822dee00471fadb4
parentf5e3dac58d378864c2d064867041483d4f26f7c6 (diff)
parent4c2b7c49e79c9d1f17f560ad6a5149fc67514084 (diff)
downloadponysay-e12021971dd1eb20ba58c0aaf65412dba0c7d6ca.tar.gz
ponysay-e12021971dd1eb20ba58c0aaf65412dba0c7d6ca.tar.bz2
ponysay-e12021971dd1eb20ba58c0aaf65412dba0c7d6ca.zip
Merge branch 'master' of github.com:erkin/ponysay
-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