[pkgsrc/pkgsrc-2003Q4]: pkgsrc/mk/install Pullup correct functionality to the...

[agc <agc%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1e1d12620fb0
branches:  pkgsrc-2003Q4
changeset: 463719:1e1d12620fb0
user:      agc <agc%pkgsrc.org@localhost>
date:      Tue Dec 30 16:04:35 2003 +0000

description:
Pullup correct functionality to the pkgsrc-2003Q4 branch, requested by
Julio M. Merino Vidal.

        Module Name:    pkgsrc
        Committed By:   jmmv
        Date:           Fri Dec 19 23:18:49 UTC 2003

        Modified Files:
                pkgsrc/mk/install: fonts

        Log Message:
        Use ${CD}, ${GREP}, ${RM} and ${RMDIR} instead of directly calling commands.

diffstat:

 mk/install/fonts |  20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diffs (48 lines):

diff -r d784464b2aff -r 1e1d12620fb0 mk/install/fonts
--- a/mk/install/fonts  Tue Dec 30 15:57:23 2003 +0000
+++ b/mk/install/fonts  Tue Dec 30 16:04:35 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: fonts,v 1.1 2003/02/16 12:14:32 jmmv Exp $
+# $NetBSD: fonts,v 1.1.6.1 2003/12/30 16:04:35 agc Exp $
 #
 # Handle font databases; used by fonts.mk.
 #
@@ -18,9 +18,9 @@
        ${ECHO} "===> Updating font databases"
        if [ "${FONTS_TTF}" = "YES" ]; then
                for d in ${FONTS_TTF_DIRS}; do
-                       if [ -z "`cd $d ; ls | grep -v ^fonts | grep -v ^Fontmap`" ]; then
-                               rm -f $d/fonts* $d/Fontmap*
-                               rmdir $d >/dev/null 2>&1
+                       if [ -z "`cd $d ; ${LS} | ${GREP} -v ^fonts | ${GREP} -v ^Fontmap`" ]; then
+                               ${RM} -f $d/fonts* $d/Fontmap*
+                               ${RMDIR} $d >/dev/null 2>&1
                        else
                                ( cd $d && ${TTMKFDIR} >fonts.dir 2>/dev/null )
                        fi
@@ -28,9 +28,9 @@
        fi
        if [ "${FONTS_TYPE1}" = "YES" ]; then
                for d in ${FONTS_TYPE1_DIRS}; do
-                       if [ -z "`cd $d ; ls | grep -v ^fonts | grep -v ^Fontmap`" ]; then
-                               rm -f $d/fonts* $d/Fontmap*
-                               rmdir $d >/dev/null 2>&1
+                       if [ -z "`cd $d ; ${LS} | ${GREP} -v ^fonts | ${GREP} -v ^Fontmap`" ]; then
+                               ${RM} -f $d/fonts* $d/Fontmap*
+                               ${RMDIR} $d >/dev/null 2>&1
                        else
                                ( cd $d && ${TYPE1INST} >/dev/null 2>&1 )
                        fi
@@ -38,9 +38,9 @@
        fi
        if [ "${FONTS_X11}" = "YES" ]; then
                for d in ${FONTS_X11_DIRS}; do
-                       if [ -z "`cd $d ; ls | grep -v ^fonts | grep -v ^Fontmap`" ]; then
-                               rm -f $d/fonts* $d/Fontmap*
-                               rmdir $d >/dev/null 2>&1
+                       if [ -z "`cd $d ; ${LS} | ${GREP} -v ^fonts | ${GREP} -v ^Fontmap`" ]; then
+                               ${RM} -f $d/fonts* $d/Fontmap*
+                               ${RMDIR} $d >/dev/null 2>&1
                        else
                                ( cd $d && ${MKFONTDIR} >/dev/null 2>&1 )
                        fi