aboutsummaryrefslogtreecommitdiff
path: root/ponysay
diff options
context:
space:
mode:
authorMattias Andrée <maandree@operamail.com>2012-07-19 12:05:14 -0700
committerMattias Andrée <maandree@operamail.com>2012-07-19 12:05:14 -0700
commit3c53e1fb10298d4ebb969fe2ae42909538467c91 (patch)
tree0416578d2d8e45db1e6e93b1b53dd79e7803bf83 /ponysay
parent839f0b20e8e4982da6a152bd6d702b699d352324 (diff)
parent9820d208a1264666e29d94072a64e1e50f0aeaa4 (diff)
downloadponysay-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
Diffstat (limited to 'ponysay')
-rwxr-xr-xponysay9
1 files changed, 4 insertions, 5 deletions
diff --git a/ponysay b/ponysay
index 1bb76c1..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,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
}