diff options
| -rw-r--r-- | Makefile | 13 | ||||
| -rw-r--r-- | completion/bash-completion.sh | 4 | ||||
| -rw-r--r-- | completion/zsh-completion.zsh | 2 | ||||
| -rwxr-xr-x | ponysay | 4 |
4 files changed, 12 insertions, 11 deletions
@@ -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 : \ @@ -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 |