| mergemaster.sh (91193) | mergemaster.sh (91223) |
|---|---|
| 1#!/bin/sh 2 3# mergemaster 4 5# Compare files created by /usr/src/etc/Makefile (or the directory 6# the user specifies) with the currently installed copies. 7 8# Copyright 1998-2002 Douglas Barton 9# DougB@FreeBSD.org 10 | 1#!/bin/sh 2 3# mergemaster 4 5# Compare files created by /usr/src/etc/Makefile (or the directory 6# the user specifies) with the currently installed copies. 7 8# Copyright 1998-2002 Douglas Barton 9# DougB@FreeBSD.org 10 |
| 11# $FreeBSD: head/usr.sbin/mergemaster/mergemaster.sh 91193 2002-02-24 10:22:14Z dougb $ | 11# $FreeBSD: head/usr.sbin/mergemaster/mergemaster.sh 91223 2002-02-25 04:52:56Z dougb $ |
| 12 13PATH=/bin:/usr/bin:/usr/sbin 14 15display_usage () { 16 VERSION_NUMBER=`grep "[$]FreeBSD:" $0 | cut -d ' ' -f 4` 17 echo "mergemaster version ${VERSION_NUMBER}" 18 echo 'Usage: mergemaster [-scrvahipC] [-m /path]' 19 echo ' [-t /path] [-d] [-u N] [-w N] [-D /path]' --- 931 unchanged lines hidden (view full) --- 951 if [ -r "${DESTDIR}${CONF_FILE}" ]; then 952 echo '' 953 echo "*** From ${DESTDIR}${CONF_FILE}" 954 echo "*** From ${DESTDIR}/etc/defaults/rc.conf" 955 956 for RC_CONF_VAR in `grep -i ^[a-z] ${DESTDIR}${CONF_FILE} | 957 cut -d '=' -f 1`; do 958 echo '' | 12 13PATH=/bin:/usr/bin:/usr/sbin 14 15display_usage () { 16 VERSION_NUMBER=`grep "[$]FreeBSD:" $0 | cut -d ' ' -f 4` 17 echo "mergemaster version ${VERSION_NUMBER}" 18 echo 'Usage: mergemaster [-scrvahipC] [-m /path]' 19 echo ' [-t /path] [-d] [-u N] [-w N] [-D /path]' --- 931 unchanged lines hidden (view full) --- 951 if [ -r "${DESTDIR}${CONF_FILE}" ]; then 952 echo '' 953 echo "*** From ${DESTDIR}${CONF_FILE}" 954 echo "*** From ${DESTDIR}/etc/defaults/rc.conf" 955 956 for RC_CONF_VAR in `grep -i ^[a-z] ${DESTDIR}${CONF_FILE} | 957 cut -d '=' -f 1`; do 958 echo '' |
| 959 grep ^${RC_CONF_VAR} ${DESTDIR}${CONF_FILE} 960 grep ^${RC_CONF_VAR} ${DESTDIR}/etc/defaults/rc.conf || | 959 grep -w ^${RC_CONF_VAR} ${DESTDIR}${CONF_FILE} 960 grep -w ^${RC_CONF_VAR} ${DESTDIR}/etc/defaults/rc.conf || |
| 961 echo ' * No default variable with this name' 962 done 963 fi 964 done) | ${PAGER} 965 echo '' 966 ;; 967esac 968 --- 5 unchanged lines hidden (view full) --- 974 (echo '' 975 echo '*** Comparing make variables' 976 echo '' 977 echo "*** From ${DESTDIR}/etc/make.conf" 978 echo "*** From ${MAKE_CONF}" 979 980 for MAKE_VAR in `grep -i ^[a-z] /etc/make.conf | cut -d '=' -f 1`; do 981 echo '' | 961 echo ' * No default variable with this name' 962 done 963 fi 964 done) | ${PAGER} 965 echo '' 966 ;; 967esac 968 --- 5 unchanged lines hidden (view full) --- 974 (echo '' 975 echo '*** Comparing make variables' 976 echo '' 977 echo "*** From ${DESTDIR}/etc/make.conf" 978 echo "*** From ${MAKE_CONF}" 979 980 for MAKE_VAR in `grep -i ^[a-z] /etc/make.conf | cut -d '=' -f 1`; do 981 echo '' |
| 982 grep ^${MAKE_VAR} ${DESTDIR}/etc/make.conf 983 grep ^#${MAKE_VAR} ${MAKE_CONF} || | 982 grep -w ^${MAKE_VAR} ${DESTDIR}/etc/make.conf 983 grep -w ^#${MAKE_VAR} ${MAKE_CONF} || |
| 984 echo ' * No example variable with this name' 985 done) | ${PAGER} 986 ;; 987esac 988 989exit 0 990 | 984 echo ' * No example variable with this name' 985 done) | ${PAGER} 986 ;; 987esac 988 989exit 0 990 |