diff options
| author | Mattias Andrée <maandree@operamail.com> | 2012-07-19 12:05:14 -0700 |
|---|---|---|
| committer | Mattias Andrée <maandree@operamail.com> | 2012-07-19 12:05:14 -0700 |
| commit | 3c53e1fb10298d4ebb969fe2ae42909538467c91 (patch) | |
| tree | 0416578d2d8e45db1e6e93b1b53dd79e7803bf83 | |
| parent | 839f0b20e8e4982da6a152bd6d702b699d352324 (diff) | |
| parent | 9820d208a1264666e29d94072a64e1e50f0aeaa4 (diff) | |
| download | ponysay-3c53e1fb10298d4ebb969fe2ae42909538467c91.tar.gz ponysay-3c53e1fb10298d4ebb969fe2ae42909538467c91.tar.bz2 ponysay-3c53e1fb10298d4ebb969fe2ae42909538467c91.zip | |
Merge pull request #38 from etu/master
Moved ponysaytruncater and ponysaylist.pl to /usr/lib/ponysay
| -rw-r--r-- | Makefile | 10 | ||||
| -rwxr-xr-x | ponysay | 9 |
2 files changed, 10 insertions, 9 deletions
@@ -37,10 +37,12 @@ install: all mkdir -p "$(DESTDIR)/usr/bin/" install "ponysay" "$(DESTDIR)/usr/bin/ponysay" - install -s "ponysaytruncater" "$(DESTDIR)/usr/bin/ponysaytruncater" - install "ponysaylist.pl" "$(DESTDIR)/usr/bin/ponysaylist.pl" ln -sf "ponysay" "$(DESTDIR)/usr/bin/ponythink" + mkdir -p "$(DESTDIR)/usr/lib/ponysay/" + install -s "ponysaytruncater" "$(DESTDIR)/usr/lib/ponysay/truncater" + install "ponysaylist.pl" "$(DESTDIR)/usr/lib/ponysay/list.pl" + mkdir -p "$(DESTDIR)/usr/share/bash-completion/completions/" install "completion/bash-completion.sh" "$(DESTDIR)/usr/share/bash-completion/completions/ponysay" install "completion/bash-completion-think.sh" "$(DESTDIR)/usr/share/bash-completion/completions/ponythink" @@ -87,9 +89,9 @@ uninstall: rm -fr "$(DESTDIR)/usr/share/ponysay/ponies" rm -fr "$(DESTDIR)/usr/share/ponysay/ttyponies" unlink "$(DESTDIR)/usr/bin/ponysay" - unlink "$(DESTDIR)/usr/bin/ponysaylist.pl" - unlink "$(DESTDIR)/usr/bin/ponysaytruncater" unlink "$(DESTDIR)/usr/bin/ponythink" + unlink "$(DESTDIR)/usr/lib/ponysay/list.pl" + unlink "$(DESTDIR)/usr/lib/ponysay/truncater" unlink "$(DESTDIR)/usr/share/licenses/ponysay/COPYING" unlink "$(DESTDIR)/usr/share/bash-completion/completions/ponysay" unlink "$(DESTDIR)/usr/share/bash-completion/completions/ponythink" @@ -3,6 +3,7 @@ version=1.0 SYSTEMPONIES="/usr/share/ponysay/ponies" HOMEPONIES="${HOME}/.local/share/ponysay/ponies" +SCRIPTDIR="$( cd -P "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" # Get bash script directory pony="*" wrap="" @@ -19,7 +20,8 @@ version() { } scrw=`(stty size <&2 || echo 0 0) | cut -d ' ' -f 2` -listcmd="ponysaylist.pl" +listcmd="${SCRIPTDIR}/../lib/ponysay/list.pl" +truncatercmd="${SCRIPTDIR}/../lib/ponysay/truncater" haspq=1 if [[ -f './pq4ps-list' ]]; then @@ -190,10 +192,7 @@ say() { cat else WIDTH=`(stty size <&2 || echo 0 0) | cut -d ' ' -f 2` - ponysaytruncater $WIDTH 2>/dev/null || - ${HOME}/.local/bin/ponysaytruncater $WIDTH 2>/dev/null || - ./ponysaytruncater $WIDTH 2>/dev/null || - cat + $truncatercmd $WIDTH 2>/dev/null || cat fi } |