From 578c5b24a89f528685271c190ed6ed13fd16cc7b Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Sat, 18 Aug 2012 15:25:20 +0200 Subject: make file update --- Makefile | 10 +++++----- ponysay | 20 ++++++++++++++++++++ 2 files changed, 25 insertions(+), 5 deletions(-) create mode 100755 ponysay diff --git a/Makefile b/Makefile index 0095614..5b60953 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/ponysay b/ponysay new file mode 100755 index 0000000..5664f16 --- /dev/null +++ b/ponysay @@ -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 -- cgit