figlet: fix compilation

1 files changed, 9 insertions, 40 deletions

diff --git a/Library/Formula/figlet.rb b/Library/Formula/figlet.rb
index 165b123d8..19f622244 100644
--- a/Library/Formula/figlet.rb
+++ b/Library/Formula/figlet.rb
@@ -17,58 +17,27 @@ class Figlet < Formula
   homepage 'http://www.figlet.org'
   md5 'ea048d8d0b56f9c58e55514d4eb04203'
 
-  def fonts
-    share + "figlet/fonts"
-  end
-
-  def patches
-    DATA
-  end
-
   def install
+    share_fonts = share+"figlet/fonts"
+
     File.chmod 0666, 'Makefile'
     File.chmod 0666, 'showfigfonts'
     man6.mkpath
     bin.mkpath
 
-    ContribFonts.new.brew { fonts.install Dir['*'] }
-    InternationalFonts.new.brew { fonts.install Dir['*'] }
+    ContribFonts.new.brew { share_fonts.install Dir['*'] }
+    InternationalFonts.new.brew { share_fonts.install Dir['*'] }
 
     inreplace "Makefile" do |s|
       s.gsub! "/usr/local/", "#{prefix}/"
-      s.change_make_var! 'DEFAULTFONTDIR', fonts
+      s.change_make_var! 'DEFAULTFONTDIR', share_fonts
       s.change_make_var! 'MANDIR', man6
     end
 
     system "make install"
   end
-end
 
-__END__
-diff --git a/showfigfonts b/showfigfonts
-index 643c60b..543379c 100644
---- a/showfigfonts
-+++ b/showfigfonts
-@@ -14,6 +14,7 @@
- DIRSAVE=`pwd`
- cd `dirname "$0"`
- PATH="$PATH":`pwd`
-+FIGDIR=`pwd`
- cd "$DIRSAVE"
- 
- # Get figlet version
-@@ -42,12 +43,12 @@ else
-     FONTDIR="`figlet -F | sed -e '1d' -e '3,$d' -e 's/Font directory: //'`"
-   else
-     # figlet 2.1 or later
--    FONTDIR="`figlet -I2`"
-+    FONTDIR="`${FIGDIR}/figlet -I2`"
-   fi
- fi
- 
- cd "$FONTDIR"
--FONTLIST=`ls *.flf | sed s/\.flf$//`
-+FONTLIST=`ls *.fl* | sed s/\.fl.$//`
- cd $DIRSAVE
- for F in $FONTLIST ; do
-   echo "$F" :
+  def test
+    system "figlet -f larry3d hello, figlet"
+  end
+end