diff options
| author | Pablo Lezaeta <prflr88@gmail.com> | 2012-07-18 15:24:42 -0400 |
|---|---|---|
| committer | Pablo Lezaeta <prflr88@gmail.com> | 2012-07-18 15:24:42 -0400 |
| commit | 998458131e5f5c59072558feb8d8b5c9fe137390 (patch) | |
| tree | 40275baa49c9ffe929bb2fcedb3d7d0bc38bc867 | |
| parent | cfcdab07877770055a10ab5fcb165c24e6c5dfbe (diff) | |
| parent | 3c53e1fb10298d4ebb969fe2ae42909538467c91 (diff) | |
| download | ponysay-998458131e5f5c59072558feb8d8b5c9fe137390.tar.gz ponysay-998458131e5f5c59072558feb8d8b5c9fe137390.tar.bz2 ponysay-998458131e5f5c59072558feb8d8b5c9fe137390.zip | |
Merge remote-tracking branch 'upstream/master'
| -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 } |