diff options
| author | agc <agc> | 2003-12-30 16:04:35 +0000 |
|---|---|---|
| committer | agc <agc> | 2003-12-30 16:04:35 +0000 |
| commit | 9816783daa73a86c98864bc1a274ff9a7896f93a (patch) | |
| tree | 67dba1514e6db57bbdffb8c6b281f0514e57bd2d | |
| parent | d88522d1139c2beae7f002086e8ffb526623e6c3 (diff) | |
| download | pkgsrc-9816783daa73a86c98864bc1a274ff9a7896f93a.tar.gz | |
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.
| -rw-r--r-- | mk/install/fonts | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/mk/install/fonts b/mk/install/fonts index 84a0c43260c..6a7969d8a8c 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.1.6.1 2003/12/30 16:04:35 agc 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 |