From e88224d519a8efe04021667b27426fd41bf57e22 Mon Sep 17 00:00:00 2001 From: Claudio Matsuoka Date: Tue, 25 Jan 2011 23:56:09 -0200 Subject: [PATCH] Figlist changed to check for local figlet Same change made to showfigfonts, figlist can now use the local figlet executable instead of the system executable. Signed-off-by: Claudio Matsuoka --- figlist | 15 ++++++--------- showfigfonts | 1 - 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/figlist b/figlist index 3f629f4..6dea3b2 100755 --- a/figlist +++ b/figlist @@ -7,14 +7,11 @@ # # Usage: figlist [ -d directory ] -# Set up PATH so figlet can be found -DIRSAVE=`pwd` -cd `dirname "$0"` -PATH="$PATH":`pwd` -cd "$DIRSAVE" +DIR=`dirname $0` +FIGLET=$DIR/figlet # Get figlet version -FIGLETVERSION=`figlet -I1 2>/dev/null` +FIGLETVERSION=`$FIGLET -I1 2>/dev/null` if [ -z "$FIGLETVERSION" ]; then FIGLETVERSION=20000 fi @@ -37,14 +34,14 @@ fi if [ "$FIGLETVERSION" -lt 20100 ]; then # figlet 2.0 - figlet $FONTDIROPT -F + $FIGLET $FONTDIROPT -F exit fi # From here on we may assume figlet 2.1 or later -FONTDIR=`figlet $FONTDIROPT -I2` -FONT=`figlet -I3` +FONTDIR=`$FIGLET $FONTDIROPT -I2` +FONT=`$FIGLET -I3` echo "Default font: $FONT" echo "Font directory: $FONTDIR" diff --git a/showfigfonts b/showfigfonts index f830cfb..90c4d0a 100755 --- a/showfigfonts +++ b/showfigfonts @@ -10,7 +10,6 @@ # # Usage: showfigfonts [ -d directory ] [ word ] -# Set up PATH so figlet can be found DIR=`dirname $0` FIGLET=$DIR/figlet