summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorjmmv <jmmv>2003-12-19 23:18:49 +0000
committerjmmv <jmmv>2003-12-19 23:18:49 +0000
commit1cf6718f4321fa5431871251033da4ac72fcee51 (patch)
tree5eacfb4acd223a59539df810298b3b9b6c421a08 /mk
parented4b06853b219059752e761e1bf0e320b4d727c4 (diff)
downloadpkgsrc-1cf6718f4321fa5431871251033da4ac72fcee51.tar.gz
Use ${CD}, ${GREP}, ${RM} and ${RMDIR} instead of directly calling commands.
Diffstat (limited to 'mk')
-rw-r--r--mk/install/fonts20
1 files changed, 10 insertions, 10 deletions
diff --git a/mk/install/fonts b/mk/install/fonts
index 84a0c43260c..da320b927b7 100644
--- a/mk/install/fonts
+++ b/mk/install/fonts
@@ -1,4 +1,4 @@
-# $NetBSD: fonts,v 1.1 2003/02/16 12:14:32 jmmv Exp $
+# $NetBSD: fonts,v 1.2 2003/12/19 23:18:49 jmmv Exp $
#
# Handle font databases; used by fonts.mk.
#
@@ -18,9 +18,9 @@ POST-INSTALL|POST-DEINSTALL)
${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 @@ POST-INSTALL|POST-DEINSTALL)
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 @@ POST-INSTALL|POST-DEINSTALL)
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