rpms/xorg-x11/devel xfs.init,1.10,1.11

[fedora-cvs-commits at redhat.com]

Update of /cvs/dist/rpms/xorg-x11/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6195

Modified Files:
	xfs.init 
Log Message:
Change xfs.init script to check first for .ot[cf] files and secondly
for .tt[cf] files.  Rationale:  ttmkfdir handles .tt[cf] only, while
mkfontscale handles both .[ot]t[cf] files.  Previous to this change,
if a directory contained both .tt[cf] and .ot[cf] files, both ttmkfdir
and mkfontscale would run, along with 2 invocations of mkfontdir.  The
mkfontscale/mkfontdir invocation blowing away the results of ttmkfdir
anyway.  Thus this change is only a minor optimization, and has no
functional change.




Index: xfs.init
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11/devel/xfs.init,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xfs.init	4 Apr 2005 21:12:16 -0000	1.10
+++ xfs.init	4 Apr 2005 21:16:43 -0000	1.11
@@ -41,13 +41,12 @@
          fi
          if [ "$REGEN_FONTS_DIR" = "yes" ]; then
             rm -f fonts.dir 
-            if ls | grep -iqs '\.tt[cf]$' ; then
-               # TrueType fonts found, generate fonts.scale and fonts.dir
-               ttmkfdir -d . -o fonts.scale && mkfontdir . &>/dev/null
-            fi
             if ls | grep -iqs '\.ot[cf]$' ; then
                # Opentype fonts found, generate fonts.scale and fonts.dir
                mkfontscale . && mkfontdir . &>/dev/null
+            elif ls | grep -iqs '\.tt[cf]$' ; then
+               # TrueType fonts found, generate fonts.scale and fonts.dir
+               ttmkfdir -d . -o fonts.scale && mkfontdir . &>/dev/null
             fi
             if ls | grep -Eiqsv '(^fonts\.(scale|alias|cache.*)$|.+(\.[ot]t[cf]|dir)$)' ; then
                # This directory contains non-TrueType/non-Opentype fonts