Merge pull request #21 from jristz/master

Request submit teses (I hope this is the right way)
This commit is contained in:
Mattias Andrée 2012-07-04 23:43:56 -07:00
commit 6eff50c84a
20 changed files with 30 additions and 13 deletions

View file

@ -4,10 +4,11 @@ ponysaytruncater:
gcc -o "ponysaytruncater" "ponysaytruncater.c" gcc -o "ponysaytruncater" "ponysaytruncater.c"
install: all install: all
mkdir -p "$(DESTDIR)/usr/share/ponies" mkdir -p "$(DESTDIR)/usr/share/ponysay/"
mkdir -p "$(DESTDIR)/usr/share/ttyponies" mkdir -p "$(DESTDIR)/usr/share/ponysay/ponies"
cp ponies/*.pony "$(DESTDIR)/usr/share/ponies/" mkdir -p "$(DESTDIR)/usr/share/ponysay/ttyponies"
cp ttyponies/*.pony "$(DESTDIR)/usr/share/ttyponies/" cp ponies/*.pony "$(DESTDIR)/usr/share/ponysay/ponies/"
cp ttyponies/*.pony "$(DESTDIR)/usr/share/ponysay/ttyponies/"
mkdir -p "$(DESTDIR)/usr/bin/" mkdir -p "$(DESTDIR)/usr/bin/"
install "ponysay" "$(DESTDIR)/usr/bin/ponysay" install "ponysay" "$(DESTDIR)/usr/bin/ponysay"
@ -27,8 +28,8 @@ install: all
install "manpage.1" "$(DESTDIR)/usr/share/man/man1/ponysay.1" install "manpage.1" "$(DESTDIR)/usr/share/man/man1/ponysay.1"
uninstall: uninstall:
rm -fr "$(DESTDIR)/usr/share/ponies" rm -fr "$(DESTDIR)/usr/share/ponysay/ponies"
rm -fr "$(DESTDIR)/usr/share/ttyponies" rm -fr "$(DESTDIR)/usr/share/ponysay/ttyponies"
unlink "$(DESTDIR)/usr/bin/ponysay" unlink "$(DESTDIR)/usr/bin/ponysay"
unlink "$(DESTDIR)/usr/bin/ponysaytruncater" unlink "$(DESTDIR)/usr/bin/ponysaytruncater"
unlink "$(DESTDIR)/usr/bin/ponythink" unlink "$(DESTDIR)/usr/bin/ponythink"

View file

@ -10,10 +10,10 @@ _ponysay()
if [[ $prev = "-f" ]]; then if [[ $prev = "-f" ]]; then
COMPREPLY=() COMPREPLY=()
sysponies=/usr/share/ponies/ sysponies=/usr/share/ponysay/ponies/
usrponies=~/.ponies/ usrponies=~/.ponies/
if [[ $TERM = "linux" ]]; then if [[ $TERM = "linux" ]]; then
sysponies=/usr/share/ttyponies/ sysponies=/usr/share/ponysay/ttyponies/
usrponies=~/.ttyponies/ usrponies=~/.ttyponies/
fi fi

View file

@ -3,7 +3,7 @@ _shortopts=(
'-v[Show version and exit]' '-v[Show version and exit]'
'-h[Show this help and exit]' '-h[Show this help and exit]'
'-l[list ponyfiles]' '-l[list ponyfiles]'
'-f[Select a pony (either a filename or a ponyname]: :_path_files -W "/usr/share/ponies" -g "*(\:r)"' '-f[Select a pony (either a filename or a ponyname]: :_path_files -W "/usr/share/ponysay/ponies" -g "*(\:r)"'
'-W[The screen column where the message should be wrapped]' '-W[The screen column where the message should be wrapped]'
) )
_arguments -s : \ _arguments -s : \

1
ponies/lulamoon.pony Symbolic link
View file

@ -0,0 +1 @@
./trixie.pony

1
ponies/timeturner.pony Symbolic link
View file

@ -0,0 +1 @@
./doctornohat.pony

1
ponies/trixielulamoon.pony Symbolic link
View file

@ -0,0 +1 @@
./trixie.pony

1
ponies/twilightvelvet.pony Symbolic link
View file

@ -0,0 +1 @@
./mrssparkle.pony

View file

@ -1,14 +1,14 @@
#!/usr/bin/env bash #!/usr/bin/env bash
version=0.9 version=0.9
SYSTEMPONIES=/usr/share/ponies SYSTEMPONIES=/usr/share/ponysay/ponies
HOMEPONIES="${HOME}/.ponies" HOMEPONIES="${HOME}/.ponysay/ponies"
pony="*" pony="*"
wrap= wrap=
if [ "$TERM" = "linux" ]; then if [ "$TERM" = "linux" ]; then
SYSTEMPONIES=/usr/share/ttyponies SYSTEMPONIES=/usr/share/ponysay/ttyponies
HOMEPONIES="${HOME}/.ttyponies" HOMEPONIES="${HOME}/.ponysay/ttyponies"
fi fi
cmd=cowsay cmd=cowsay

1
ttyponies/carrottop.pony Symbolic link
View file

@ -0,0 +1 @@
./carrot.pony

View file

@ -0,0 +1 @@
./carrot.pony

1
ttyponies/harpass.pony Symbolic link
View file

@ -0,0 +1 @@
./lyra.pony

1
ttyponies/heartstrings.pony Symbolic link
View file

@ -0,0 +1 @@
./lyra.pony

1
ttyponies/lulamoon.pony Symbolic link
View file

@ -0,0 +1 @@
./trixie.pony

1
ttyponies/minuette.pony Symbolic link
View file

@ -0,0 +1 @@
./colgate.pony

1
ttyponies/noteworthy.pony Symbolic link
View file

@ -0,0 +1 @@
./blues.pony

1
ttyponies/perry.pony Symbolic link
View file

@ -0,0 +1 @@
./pokey.pony

1
ttyponies/pokeypierce.pony Symbolic link
View file

@ -0,0 +1 @@
./pokey.pony

1
ttyponies/timeturner.pony Symbolic link
View file

@ -0,0 +1 @@
./doctornohat.pony

View file

@ -0,0 +1 @@
./trixie.pony

View file

@ -0,0 +1 @@
./mrssparkle.pony