Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Pablo Lezaeta 2012-07-18 15:53:43 -04:00
commit 3e35bb7eac
2 changed files with 19 additions and 7 deletions

View file

@ -4,12 +4,12 @@
Erkin Batu Altunbaş Erkin Batu Altunbaş
Mattias Andrée Mattias Andrée
Sven-Hendrik Haase Sven-Hendrik Haase
Pablo Lezaeta
Jan Alexander Steffens Jan Alexander Steffens
# Patchers and other contributors # Patchers and other contributors
Elis Axelsson Elis Axelsson
Duane Bekaert Duane Bekaert
Pablo Lezaeta
Kyah Rindlisbacher Kyah Rindlisbacher
James Ross-Gowan James Ross-Gowan
Louis Taylor Louis Taylor

View file

@ -4,21 +4,33 @@
# #
# Author: Elis Axelsson <etu AT elis DOT nu> # Author: Elis Axelsson <etu AT elis DOT nu>
if test $TERM = "linux"
if test -d /usr/share/ponysay/ponies/ set -g systempath "/usr/share/ponysay/ttyponies/"
set -g systemponies (ls --color=no /usr/share/ponysay/ponies/ | sed 's/\.pony/\t Pony from \/usr\/share\/ponysay\/ponies\//') set -g homepath "~/.local/share/ponysay/ttyponies/"
else
set -g systempath "/usr/share/ponysay/ponies/"
set -g homepath "~/.local/share/ponysay/ponies/"
end 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 $systempath
set -g systemponies (ls --color=no $systempath | sed 's/\.pony//')
end end
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 h --description "Help of ponysay"
complete -c ponysay -s v --description "Version 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"
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" 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 systemponies
set -e homeponies set -e homeponies