From af2cc12de9109c7fdb5234f3a06fd159f408591f Mon Sep 17 00:00:00 2001 From: Elis Axelsson Date: Thu, 19 Jul 2012 20:54:44 +0200 Subject: Moved ponysaytruncater and ponysaylist.pl to /usr/lib/ponysay/truncater and /usr/lib/ponysay/list.pl --- Makefile | 10 ++++++---- ponysay | 8 +++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 37883a6..c1ed92e 100644 --- a/Makefile +++ b/Makefile @@ -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" diff --git a/ponysay b/ponysay index 1bb76c1..1034456 100755 --- a/ponysay +++ b/ponysay @@ -19,7 +19,8 @@ version() { } scrw=`(stty size <&2 || echo 0 0) | cut -d ' ' -f 2` -listcmd="ponysaylist.pl" +listcmd="/usr/lib/ponysay/list.pl" +truncatercmd="/usr/lib/ponysay/truncater" haspq=1 if [[ -f './pq4ps-list' ]]; then @@ -190,10 +191,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 } -- cgit From 9820d208a1264666e29d94072a64e1e50f0aeaa4 Mon Sep 17 00:00:00 2001 From: Elis Axelsson Date: Thu, 19 Jul 2012 20:58:58 +0200 Subject: Fix path to truncater and list --- ponysay | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ponysay b/ponysay index 1034456..d7fb068 100755 --- a/ponysay +++ b/ponysay @@ -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,8 +20,8 @@ version() { } scrw=`(stty size <&2 || echo 0 0) | cut -d ' ' -f 2` -listcmd="/usr/lib/ponysay/list.pl" -truncatercmd="/usr/lib/ponysay/truncater" +listcmd="${SCRIPTDIR}/../lib/ponysay/list.pl" +truncatercmd="${SCRIPTDIR}/../lib/ponysay/truncater" haspq=1 if [[ -f './pq4ps-list' ]]; then -- cgit