Merge tag 'upstream/2.2.4'

Upstream version 2.2.4

2 files changed, 7 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/figlist.6 b/figlist.6
index 448f812..15586bc 100644
--- a/figlist.6
+++ b/figlist.6
@@ -8,7 +8,7 @@
 .\"
 .\" Manual page by Jonathon Abbott, for the Debian Project
 .\" slightly modified by Francesco Tapparo, for the Debian Project
-.TH FIGLIST 6 "12 January 2011" "v2.2.3"
+.TH FIGLIST 6 "26 January 2011" "v2.2.4"
 
 .SH NAME
 figlist \- lists figlet fonts and control files