packages: java-xmlgraphics-fop/fop-font-install.sh - don't override FOP_CON...

pawelz pawelz at pld-linux.org
Sun Apr 4 22:05:09 CEST 2010


Author: pawelz                       Date: Sun Apr  4 20:05:09 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- don't override FOP_CONF env
- use /var/lib/fop/fop-font.config as default config

---- Files affected:
packages/java-xmlgraphics-fop:
   fop-font-install.sh (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: packages/java-xmlgraphics-fop/fop-font-install.sh
diff -u packages/java-xmlgraphics-fop/fop-font-install.sh:1.6 packages/java-xmlgraphics-fop/fop-font-install.sh:1.7
--- packages/java-xmlgraphics-fop/fop-font-install.sh:1.6	Sun Apr  4 00:54:37 2010
+++ packages/java-xmlgraphics-fop/fop-font-install.sh	Sun Apr  4 22:05:04 2010
@@ -3,7 +3,8 @@
 FONTDIR=/usr/share/fonts
 TTF_DIR=$FONTDIR/TTF
 TTF_TOOL=/usr/bin/ttmkfdir
-FOP_CONF=$FONTDIR/fop-font.config
+FOPDIR=/var/lib/fop
+FOP_CONF=${FOP_CONF:-"$FOPDIR/fop-font.config"}
 
 jars="xmlgraphics-fop xml-apis xalan xerces-j2 commons-io xmlgraphics-commons"
 
@@ -13,7 +14,7 @@
 # create font metric files
 for font in  $TTF_DIR/*.ttf; do
     java -classpath $CLASSPATH \
-        org.apache.fop.fonts.apps.TTFReader $font /var/lib/fop/$(basename $font .ttf).xml;
+        org.apache.fop.fonts.apps.TTFReader $font $FOPDIR/$(basename $font .ttf).xml;
 done
 
 # create configuration file
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-xmlgraphics-fop/fop-font-install.sh?r1=1.6&r2=1.7&f=u



More information about the pld-cvs-commit mailing list