From aa0b3c676d3e128ee7e6c72894919adf3b7c5ff5 Mon Sep 17 00:00:00 2001 From: Pablo Lezaeta Date: Wed, 4 Jul 2012 23:21:21 -0400 Subject: In synchro for ponies and ttyponies --- ponies/timeturner.pony | 1 + ttyponies/carrottop.pony | 1 + ttyponies/goldenharvest.pony | 1 + ttyponies/harpass.pony | 1 + ttyponies/heartstrings.pony | 1 + ttyponies/minuette.pony | 1 + ttyponies/noteworthy.pony | 1 + ttyponies/perry.pony | 1 + ttyponies/pokeypierce.pony | 1 + ttyponies/timeturner.pony | 1 + 10 files changed, 10 insertions(+) create mode 120000 ponies/timeturner.pony create mode 120000 ttyponies/carrottop.pony create mode 120000 ttyponies/goldenharvest.pony create mode 120000 ttyponies/harpass.pony create mode 120000 ttyponies/heartstrings.pony create mode 120000 ttyponies/minuette.pony create mode 120000 ttyponies/noteworthy.pony create mode 120000 ttyponies/perry.pony create mode 120000 ttyponies/pokeypierce.pony create mode 120000 ttyponies/timeturner.pony diff --git a/ponies/timeturner.pony b/ponies/timeturner.pony new file mode 120000 index 0000000..df51240 --- /dev/null +++ b/ponies/timeturner.pony @@ -0,0 +1 @@ +./doctornohat.pony \ No newline at end of file diff --git a/ttyponies/carrottop.pony b/ttyponies/carrottop.pony new file mode 120000 index 0000000..dc31181 --- /dev/null +++ b/ttyponies/carrottop.pony @@ -0,0 +1 @@ +./carrot.pony \ No newline at end of file diff --git a/ttyponies/goldenharvest.pony b/ttyponies/goldenharvest.pony new file mode 120000 index 0000000..dc31181 --- /dev/null +++ b/ttyponies/goldenharvest.pony @@ -0,0 +1 @@ +./carrot.pony \ No newline at end of file diff --git a/ttyponies/harpass.pony b/ttyponies/harpass.pony new file mode 120000 index 0000000..4aa840b --- /dev/null +++ b/ttyponies/harpass.pony @@ -0,0 +1 @@ +./lyra.pony \ No newline at end of file diff --git a/ttyponies/heartstrings.pony b/ttyponies/heartstrings.pony new file mode 120000 index 0000000..4aa840b --- /dev/null +++ b/ttyponies/heartstrings.pony @@ -0,0 +1 @@ +./lyra.pony \ No newline at end of file diff --git a/ttyponies/minuette.pony b/ttyponies/minuette.pony new file mode 120000 index 0000000..565e5b5 --- /dev/null +++ b/ttyponies/minuette.pony @@ -0,0 +1 @@ +./colgate.pony \ No newline at end of file diff --git a/ttyponies/noteworthy.pony b/ttyponies/noteworthy.pony new file mode 120000 index 0000000..fca4a4f --- /dev/null +++ b/ttyponies/noteworthy.pony @@ -0,0 +1 @@ +./blues.pony \ No newline at end of file diff --git a/ttyponies/perry.pony b/ttyponies/perry.pony new file mode 120000 index 0000000..93a1368 --- /dev/null +++ b/ttyponies/perry.pony @@ -0,0 +1 @@ +./pokey.pony \ No newline at end of file diff --git a/ttyponies/pokeypierce.pony b/ttyponies/pokeypierce.pony new file mode 120000 index 0000000..93a1368 --- /dev/null +++ b/ttyponies/pokeypierce.pony @@ -0,0 +1 @@ +./pokey.pony \ No newline at end of file diff --git a/ttyponies/timeturner.pony b/ttyponies/timeturner.pony new file mode 120000 index 0000000..df51240 --- /dev/null +++ b/ttyponies/timeturner.pony @@ -0,0 +1 @@ +./doctornohat.pony \ No newline at end of file -- cgit From 4063e82a1512515358480b53d87223f71e0efc20 Mon Sep 17 00:00:00 2001 From: Pablo Lezaeta Date: Wed, 4 Jul 2012 23:30:29 -0400 Subject: Migration to /usr/share/ponysay/{,tty}ponies (need more reviews) --- Makefile | 13 +++++++------ completion/bash-completion.sh | 4 ++-- completion/zsh-completion.zsh | 2 +- ponysay | 4 ++-- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 3ae7314..754009c 100644 --- a/Makefile +++ b/Makefile @@ -4,10 +4,11 @@ ponysaytruncater: gcc -o "ponysaytruncater" "ponysaytruncater.c" install: all - mkdir -p "$(DESTDIR)/usr/share/ponies" - mkdir -p "$(DESTDIR)/usr/share/ttyponies" - cp ponies/*.pony "$(DESTDIR)/usr/share/ponies/" - cp ttyponies/*.pony "$(DESTDIR)/usr/share/ttyponies/" + mkdir -p "$(DESTDIR)/usr/share/ponysay/" + mkdir -p "$(DESTDIR)/usr/share/ponysay/ponies" + mkdir -p "$(DESTDIR)/usr/share/ponysay/ttyponies" + cp ponies/*.pony "$(DESTDIR)/usr/share/ponysay/ponies/" + cp ttyponies/*.pony "$(DESTDIR)/usr/share/ponysay/ttyponies/" mkdir -p "$(DESTDIR)/usr/bin/" install "ponysay" "$(DESTDIR)/usr/bin/ponysay" @@ -24,8 +25,8 @@ install: all install "COPYING" "$(DESTDIR)/usr/share/licenses/ponysay/COPYING" uninstall: - rm -fr "$(DESTDIR)/usr/share/ponies" - rm -fr "$(DESTDIR)/usr/share/ttyponies" + rm -fr "$(DESTDIR)/usr/share/ponysay/ponies" + rm -fr "$(DESTDIR)/usr/share/ponysay/ttyponies" unlink "$(DESTDIR)/usr/bin/ponysay" unlink "$(DESTDIR)/usr/bin/ponysaytruncater" unlink "$(DESTDIR)/usr/bin/ponythink" diff --git a/completion/bash-completion.sh b/completion/bash-completion.sh index 31daef2..54b50fe 100644 --- a/completion/bash-completion.sh +++ b/completion/bash-completion.sh @@ -10,10 +10,10 @@ _ponysay() if [[ $prev = "-f" ]]; then COMPREPLY=() - sysponies=/usr/share/ponies/ + sysponies=/usr/share/ponysay/ponies/ usrponies=~/.ponies/ if [[ $TERM = "linux" ]]; then - sysponies=/usr/share/ttyponies/ + sysponies=/usr/share/ponysay/ttyponies/ usrponies=~/.ttyponies/ fi diff --git a/completion/zsh-completion.zsh b/completion/zsh-completion.zsh index 26116d2..07b2ebf 100644 --- a/completion/zsh-completion.zsh +++ b/completion/zsh-completion.zsh @@ -3,7 +3,7 @@ _shortopts=( '-v[Show version and exit]' '-h[Show this help and exit]' '-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]' ) _arguments -s : \ diff --git a/ponysay b/ponysay index a04d8d7..b3c31b8 100755 --- a/ponysay +++ b/ponysay @@ -1,13 +1,13 @@ #!/usr/bin/env bash version=0.9 -SYSTEMPONIES=/usr/share/ponies +SYSTEMPONIES=/usr/share/ponysay/ponies HOMEPONIES="${HOME}/.ponies" pony="*" wrap= if [ "$TERM" = "linux" ]; then - SYSTEMPONIES=/usr/share/ttyponies + SYSTEMPONIES=/usr/share/ponysay/ttyponies HOMEPONIES="${HOME}/.ttyponies" fi -- cgit From 7e7521aef4a510a9ebdebdcb91685bb19ae1f78a Mon Sep 17 00:00:00 2001 From: Pablo Lezaeta Date: Wed, 4 Jul 2012 23:58:27 -0400 Subject: The fourth wave of mystery pack toys includes Twilight Velvet who shares the same coat color, eye color, and cutie mark as Twilight Sparkle's mother --- ponies/twilightvelvet.pony | 1 + ttyponies/twilightvelvet.pony | 1 + 2 files changed, 2 insertions(+) create mode 120000 ponies/twilightvelvet.pony create mode 120000 ttyponies/twilightvelvet.pony diff --git a/ponies/twilightvelvet.pony b/ponies/twilightvelvet.pony new file mode 120000 index 0000000..6361d03 --- /dev/null +++ b/ponies/twilightvelvet.pony @@ -0,0 +1 @@ +./mrssparkle.pony \ No newline at end of file diff --git a/ttyponies/twilightvelvet.pony b/ttyponies/twilightvelvet.pony new file mode 120000 index 0000000..6361d03 --- /dev/null +++ b/ttyponies/twilightvelvet.pony @@ -0,0 +1 @@ +./mrssparkle.pony \ No newline at end of file -- cgit From cb1386607d234a8552e453ddef1445f6e6289f22 Mon Sep 17 00:00:00 2001 From: Pablo Lezaeta Date: Wed, 4 Jul 2012 23:59:54 -0400 Subject: trixielulamoon and lulamoon, from the blindbags now are linked from trixie --- ponies/lulamoon.pony | 1 + ponies/trixielulamoon.pony | 1 + ttyponies/lulamoon.pony | 1 + ttyponies/trixielulamoon.pony | 1 + 4 files changed, 4 insertions(+) create mode 120000 ponies/lulamoon.pony create mode 120000 ponies/trixielulamoon.pony create mode 120000 ttyponies/lulamoon.pony create mode 120000 ttyponies/trixielulamoon.pony diff --git a/ponies/lulamoon.pony b/ponies/lulamoon.pony new file mode 120000 index 0000000..76684f9 --- /dev/null +++ b/ponies/lulamoon.pony @@ -0,0 +1 @@ +./trixie.pony \ No newline at end of file diff --git a/ponies/trixielulamoon.pony b/ponies/trixielulamoon.pony new file mode 120000 index 0000000..76684f9 --- /dev/null +++ b/ponies/trixielulamoon.pony @@ -0,0 +1 @@ +./trixie.pony \ No newline at end of file diff --git a/ttyponies/lulamoon.pony b/ttyponies/lulamoon.pony new file mode 120000 index 0000000..76684f9 --- /dev/null +++ b/ttyponies/lulamoon.pony @@ -0,0 +1 @@ +./trixie.pony \ No newline at end of file diff --git a/ttyponies/trixielulamoon.pony b/ttyponies/trixielulamoon.pony new file mode 120000 index 0000000..76684f9 --- /dev/null +++ b/ttyponies/trixielulamoon.pony @@ -0,0 +1 @@ +./trixie.pony \ No newline at end of file -- cgit From 63849f33259e162396da696e0a66976d705b81a6 Mon Sep 17 00:00:00 2001 From: Pablo Lezaeta Date: Thu, 5 Jul 2012 00:27:35 -0400 Subject: Forget the /home/fyrefly right place ./.ponysay/{,tty}ponies --- ponysay | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ponysay b/ponysay index 62d1ac8..2f60ab3 100755 --- a/ponysay +++ b/ponysay @@ -2,13 +2,13 @@ version=0.9 SYSTEMPONIES=/usr/share/ponysay/ponies -HOMEPONIES="${HOME}/.ponies" +HOMEPONIES="${HOME}/.ponysay/ponies" pony="*" wrap= if [ "$TERM" = "linux" ]; then SYSTEMPONIES=/usr/share/ponysay/ttyponies - HOMEPONIES="${HOME}/.ttyponies" + HOMEPONIES="${HOME}/.ponysay/ttyponies" fi cmd=cowsay -- cgit