From d39f25f69c95bfebfbf478b910a0cfb6d69e24da Mon Sep 17 00:00:00 2001 From: dougb Date: Mon, 25 Feb 2002 04:52:56 +0000 Subject: Improve grep'ing for variables in make.conf and rc.conf*. Thanks to cjc for the idea. --- usr.sbin/mergemaster/mergemaster.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'usr.sbin/mergemaster') diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh index 8366b22..7816a6b 100755 --- a/usr.sbin/mergemaster/mergemaster.sh +++ b/usr.sbin/mergemaster/mergemaster.sh @@ -956,8 +956,8 @@ case "${COMP_CONFS}" in for RC_CONF_VAR in `grep -i ^[a-z] ${DESTDIR}${CONF_FILE} | cut -d '=' -f 1`; do echo '' - grep ^${RC_CONF_VAR} ${DESTDIR}${CONF_FILE} - grep ^${RC_CONF_VAR} ${DESTDIR}/etc/defaults/rc.conf || + grep -w ^${RC_CONF_VAR} ${DESTDIR}${CONF_FILE} + grep -w ^${RC_CONF_VAR} ${DESTDIR}/etc/defaults/rc.conf || echo ' * No default variable with this name' done fi @@ -979,8 +979,8 @@ case "${PRE_WORLD}" in for MAKE_VAR in `grep -i ^[a-z] /etc/make.conf | cut -d '=' -f 1`; do echo '' - grep ^${MAKE_VAR} ${DESTDIR}/etc/make.conf - grep ^#${MAKE_VAR} ${MAKE_CONF} || + grep -w ^${MAKE_VAR} ${DESTDIR}/etc/make.conf + grep -w ^#${MAKE_VAR} ${MAKE_CONF} || echo ' * No example variable with this name' done) | ${PAGER} ;; -- cgit v1.1