diff options
author | Mattias Andrée <maandree@operamail.com> | 2012-08-18 15:25:20 +0200 |
---|---|---|
committer | Mattias Andrée <maandree@operamail.com> | 2012-08-18 15:25:20 +0200 |
commit | 578c5b24a89f528685271c190ed6ed13fd16cc7b (patch) | |
tree | 66378863df3b358e566f676813e35c85e0787e45 | |
parent | ce3fac588fb84a109244b9c3d60aba4fc247a86f (diff) | |
download | ponysay-578c5b24a89f528685271c190ed6ed13fd16cc7b.tar.gz ponysay-578c5b24a89f528685271c190ed6ed13fd16cc7b.tar.bz2 ponysay-578c5b24a89f528685271c190ed6ed13fd16cc7b.zip |
make file update
-rw-r--r-- | Makefile | 10 | ||||
-rwxr-xr-x | ponysay | 20 |
2 files changed, 25 insertions, 5 deletions
@@ -40,11 +40,6 @@ install-min: truncater mkdir -p "$(INSTALLDIR)/lib/ponysay/" install -s "truncater" "$(INSTALLDIR)/lib/ponysay/truncater" - install "list.pl" "$(INSTALLDIR)/lib/ponysay/list.pl" - install "linklist.pl" "$(INSTALLDIR)/lib/ponysay/linklist.pl" - install "pq4ps" "$(INSTALLDIR)/lib/ponysay/pq4ps" - install "pq4ps.pl" "$(INSTALLDIR)/lib/ponysay/pq4ps.pl" - install "pq4ps-list.pl" "$(INSTALLDIR)/lib/ponysay/pq4ps-list.pl" mkdir -p "$(INSTALLDIR)/share/licenses/ponysay/" install "COPYING" "$(INSTALLDIR)/share/licenses/ponysay/COPYING" @@ -129,7 +124,12 @@ uninstall-old: if [ -d "$(INSTALLDIR)/share/ponies" ]; then rm -fr "$(INSTALLDIR)/share/ponies" ; fi if [ -d "$(INSTALLDIR)/share/ttyponies" ]; then rm -fr "$(INSTALLDIR)/share/ttyponies" ; fi if [ -f "$(INSTALLDIR)/bin/ponysaytruncater" ]; then unlink "$(INSTALLDIR)/bin/ponysaytruncater" ; fi + if [ -d "$(INSTALLDIR)/lib/ponysay/link.pl" ]; then unlink "$(INSTALLDIR)/lib/ponysay/link.pl" ; fi + if [ -d "$(INSTALLDIR)/lib/ponysay/linklist.pl" ]; then unlink "$(INSTALLDIR)/lib/ponysay/linklist.pl" ; fi + if [ -d "$(INSTALLDIR)/lib/ponysay/pq4ps" ]; then unlink "$(INSTALLDIR)/lib/ponysay/pq4ps" ; fi + if [ -d "$(INSTALLDIR)/lib/ponysay/pq4ps.pl" ]; then unlink "$(INSTALLDIR)/lib/ponysay/pq4ps.pl" ; fi if [ -d "$(INSTALLDIR)/lib/ponysay/pq4ps-list" ]; then unlink "$(INSTALLDIR)/lib/ponysay/pq4ps-list" ; fi + if [ -d "$(INSTALLDIR)/lib/ponysay/pq4ps-list.pl" ]; then unlink "$(INSTALLDIR)/lib/ponysay/pq4ps-list.pl" ; fi clean: if [ -f "truncater" ]; then rm -f "truncater" ; fi @@ -0,0 +1,20 @@ +#!/usr/bin/env bash + +INSTALLDIR="$(dirname $( cd -P "$( dirname "${BASH_SOURCE[0]}" )" && pwd ))" +truncatercmd="$INSTALLDIR/lib/ponysay/truncater" + +scrw=`(stty size <&2 || echo 0 0) | cut -d ' ' -f 2` # Screen width + +function wtrunc { + if [ "$PONYSAY_FULL_WIDTH" = 'yes' ] || [ "$PONYSAY_FULL_WIDTH" = 'y' ] || [ "$PONYSAY_FULL_WIDTH" = '1' ]; then + cat + else + if [[ -f $truncatercmd ]]; then + $truncatercmd $scrw + else + cat + fi + fi +} + +"$0.py" "$@" | wtrunc |