diff --git a/Makefile b/Makefile index 467a0004..fe9b6319 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" @@ -27,8 +28,8 @@ install: all install "manpage.1" "$(DESTDIR)/usr/share/man/man1/ponysay.1" 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 31daef2d..54b50fee 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 26116d21..07b2ebfb 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/ponies/lulamoon.pony b/ponies/lulamoon.pony new file mode 120000 index 00000000..76684f9f --- /dev/null +++ b/ponies/lulamoon.pony @@ -0,0 +1 @@ +./trixie.pony \ No newline at end of file diff --git a/ponies/timeturner.pony b/ponies/timeturner.pony new file mode 120000 index 00000000..df512401 --- /dev/null +++ b/ponies/timeturner.pony @@ -0,0 +1 @@ +./doctornohat.pony \ No newline at end of file diff --git a/ponies/trixielulamoon.pony b/ponies/trixielulamoon.pony new file mode 120000 index 00000000..76684f9f --- /dev/null +++ b/ponies/trixielulamoon.pony @@ -0,0 +1 @@ +./trixie.pony \ No newline at end of file diff --git a/ponies/twilightvelvet.pony b/ponies/twilightvelvet.pony new file mode 120000 index 00000000..6361d036 --- /dev/null +++ b/ponies/twilightvelvet.pony @@ -0,0 +1 @@ +./mrssparkle.pony \ No newline at end of file diff --git a/ponysay b/ponysay index 4b5e912e..2f60ab38 100755 --- a/ponysay +++ b/ponysay @@ -1,14 +1,14 @@ #!/usr/bin/env bash version=0.9 -SYSTEMPONIES=/usr/share/ponies -HOMEPONIES="${HOME}/.ponies" +SYSTEMPONIES=/usr/share/ponysay/ponies +HOMEPONIES="${HOME}/.ponysay/ponies" pony="*" wrap= if [ "$TERM" = "linux" ]; then - SYSTEMPONIES=/usr/share/ttyponies - HOMEPONIES="${HOME}/.ttyponies" + SYSTEMPONIES=/usr/share/ponysay/ttyponies + HOMEPONIES="${HOME}/.ponysay/ttyponies" fi cmd=cowsay diff --git a/ttyponies/carrottop.pony b/ttyponies/carrottop.pony new file mode 120000 index 00000000..dc31181f --- /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 00000000..dc31181f --- /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 00000000..4aa840b8 --- /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 00000000..4aa840b8 --- /dev/null +++ b/ttyponies/heartstrings.pony @@ -0,0 +1 @@ +./lyra.pony \ No newline at end of file diff --git a/ttyponies/lulamoon.pony b/ttyponies/lulamoon.pony new file mode 120000 index 00000000..76684f9f --- /dev/null +++ b/ttyponies/lulamoon.pony @@ -0,0 +1 @@ +./trixie.pony \ No newline at end of file diff --git a/ttyponies/minuette.pony b/ttyponies/minuette.pony new file mode 120000 index 00000000..565e5b5a --- /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 00000000..fca4a4fd --- /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 00000000..93a1368d --- /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 00000000..93a1368d --- /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 00000000..df512401 --- /dev/null +++ b/ttyponies/timeturner.pony @@ -0,0 +1 @@ +./doctornohat.pony \ No newline at end of file diff --git a/ttyponies/trixielulamoon.pony b/ttyponies/trixielulamoon.pony new file mode 120000 index 00000000..76684f9f --- /dev/null +++ b/ttyponies/trixielulamoon.pony @@ -0,0 +1 @@ +./trixie.pony \ No newline at end of file diff --git a/ttyponies/twilightvelvet.pony b/ttyponies/twilightvelvet.pony new file mode 120000 index 00000000..6361d036 --- /dev/null +++ b/ttyponies/twilightvelvet.pony @@ -0,0 +1 @@ +./mrssparkle.pony \ No newline at end of file