diff options
author | Mattias Andrée <maandree@operamail.com> | 2012-07-24 14:58:05 +0200 |
---|---|---|
committer | Mattias Andrée <maandree@operamail.com> | 2012-07-24 14:58:05 +0200 |
commit | 110c73186be52189a293c0adda10e7874d143c0b (patch) | |
tree | a38199ca94d7397709dbf35b695cf64b13415bae | |
parent | 7dced5dd382ecebcde1f84a80f5f734b0fd046c2 (diff) | |
parent | 9fc93bbef458d8660bc9322fb637a3c0273a75b7 (diff) | |
download | ponysay-110c73186be52189a293c0adda10e7874d143c0b.tar.gz ponysay-110c73186be52189a293c0adda10e7874d143c0b.tar.bz2 ponysay-110c73186be52189a293c0adda10e7874d143c0b.zip |
Merge branch 'master' of github.com:erkin/ponysay
-rw-r--r-- | Makefile | 11 | ||||
-rw-r--r-- | pony-checklist | 6 |
2 files changed, 4 insertions, 13 deletions
@@ -1,26 +1,21 @@ all: ponysaytruncater manpages infomanual ponythinkcompletion - ponysaytruncater: gcc -o "ponysaytruncater" "ponysaytruncater.c" - manpages: gzip -9 < "manuals/manpage.6" > "manuals/manpage.6.gz" gzip -9 < "manuals/manpage.es.6" > "manuals/manpage.es.6.gz" - infomanual: makeinfo "manuals/ponysay.texinfo" gzip -9 "ponysay.info" - ponythinkcompletion: sed -e 's/ponysay/ponythink/g' <"completion/bash-completion.sh" | sed -e 's/\/ponythink\//\/ponysay\//g' -e 's/\\\/ponythink\\\//\\\/ponysay\\\//g' >"completion/bash-completion-think.sh" sed -e 's/ponysay/ponythink/g' <"completion/fish-completion.fish" | sed -e 's/\/ponythink\//\/ponysay\//g' -e 's/\\\/ponythink\\\//\\\/ponysay\\\//g' >"completion/fish-completion-think.fish" sed -e 's/ponysay/ponythink/g' <"completion/zsh-completion.zsh" | sed -e 's/\/ponythink\//\/ponysay\//g' -e 's/\\\/ponythink\\\//\\\/ponysay\\\//g' >"completion/zsh-completion-think.zsh" - ttyponies: mkdir -p ttyponies for pony in $$(ls --color=no ponies/); do \ @@ -32,7 +27,6 @@ ttyponies: fi \ done - pdfmanual: texi2pdf "manuals/ponysay.texinfo" if [[ -f "ponysay.aux" ]]; then unlink "ponysay.aux"; fi @@ -46,8 +40,7 @@ pdfmanual: if [[ -f "ponysay.tp" ]]; then unlink "ponysay.tp" ; fi if [[ -f "ponysay.vr" ]]; then unlink "ponysay.vr" ; fi - -install: +install: all mkdir -p "$(DESTDIR)/usr/share/ponysay/" mkdir -p "$(DESTDIR)/usr/share/ponysay/ponies" mkdir -p "$(DESTDIR)/usr/share/ponysay/ttyponies" @@ -110,7 +103,6 @@ install: '\\--------------------------------------------------/' @echo '' | ./ponysay -f ./`if [[ "$$TERM" = "linux" ]]; then echo ttyponies; else echo ponies; fi`/pinkiecannon.pony | tail --lines=30 ; echo -e '\n' - uninstall: rm -fr "$(DESTDIR)/usr/share/ponysay/ponies" rm -fr "$(DESTDIR)/usr/share/ponysay/ttyponies" @@ -133,7 +125,6 @@ uninstall: unlink "$(DESTDIR)/usr/share/info/ponysay.info.gz" unlink "$(DESTDIR)/usr/share/info/ponythink.info.gz" - clean: rm -f "ponysaytruncater" rm -f "completion/bash-completion-think.sh" diff --git a/pony-checklist b/pony-checklist index 8604a7f..d63d86e 100644 --- a/pony-checklist +++ b/pony-checklist @@ -19,7 +19,7 @@ Caramel Mr. Carrot Cake Mrs. Cup Cake Cheerilee -Filthy Rich http://mlp.wikia.com/wiki/Filthy_Rich +Filthy Rich Granny Smith Hoity Toity Mayor Mare @@ -462,7 +462,7 @@ Firelock http://images4.wikia.nocookie.net/__cb20120515034213/mlp/images/thumb/ Fruitbasket / Froot Loops http://images4.wikia.nocookie.net/__cb20110825220357/mlp/images/thumb/0/08/Fruitbasket.png/150px-Fruitbasket.png Grace Lightning http://images2.wikia.nocookie.net/__cb20111216012639/mlp/images/7/74/Flash.png Half Note http://images3.wikia.nocookie.net/__cb20111112194331/mlp/images/thumb/a/ae/Seabreeze.png/150px-Seabreeze.png -High Score http://images2.wikia.nocookie.net/__cb20120212052329/mlp/images/thumb/1/1f/Too_youn.png/150px-Too_youn.png +High Score Honey Drop http://images4.wikia.nocookie.net/__cb20110825222149/mlp/images/thumb/f/f6/Sweet_Bumblebee.png/150px-Sweet_Bumblebee.png Hot Wheels http://images4.wikia.nocookie.net/__cb20110825193005/mlp/images/thumb/5/59/Hot_Rod.png/150px-Hot_Rod.png Lance http://images3.wikia.nocookie.net/__cb20120106141249/mlp/images/7/74/Cutie_Pox_Fencing_pony.png @@ -488,7 +488,7 @@ Sun Glimmer http://images1.wikia.nocookie.net/__cb20110909211606/mlp/images/thu Sunny Daze http://images2.wikia.nocookie.net/__cb20110825224806/mlp/images/thumb/e/ef/SunnyDays.png/150px-SunnyDays.png Sweet Pop http://images4.wikia.nocookie.net/__cb20110825222316/mlp/images/2/29/Sweet_Pop.png Tootsie Flute http://images3.wikia.nocookie.net/__cb20110825195552/mlp/images/thumb/1/1b/Tootsie_Flute1.png/150px-Tootsie_Flute1.png -Tornado Bolt http://images1.wikia.nocookie.net/__cb20110825202839/mlp/images/thumb/6/63/Tornado_Bolt1.png/150px-Tornado_Bolt1.png +Tornado Bolt Truffle Shuffle Golden Glory http://images1.wikia.nocookie.net/__cb20120326180005/mlp/images/thumb/b/b1/Yellow_laurel_pegasus_mare_s02e22.png/150px-Yellow_laurel_pegasus_mare_s02e22.png Crafty Crate [WHAT ANOTHER] [EARTH PONY] |