| mergemaster.sh (91223) | mergemaster.sh (94196) |
|---|---|
| 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 91223 2002-02-25 04:52:56Z dougb $ | 11# $FreeBSD: head/usr.sbin/mergemaster/mergemaster.sh 94196 2002-04-08 10:30:44Z 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]' --- 503 unchanged lines hidden (view full) --- 523esac 524 525# We really don't want to have to deal with these files, since 526# master.passwd is the real file that should be compared, then 527# the user should run pwd_mkdb if necessary. 528# 529rm -f ${TEMPROOT}/etc/spwd.db ${TEMPROOT}/etc/passwd ${TEMPROOT}/etc/pwd.db 530 | 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]' --- 503 unchanged lines hidden (view full) --- 523esac 524 525# We really don't want to have to deal with these files, since 526# master.passwd is the real file that should be compared, then 527# the user should run pwd_mkdb if necessary. 528# 529rm -f ${TEMPROOT}/etc/spwd.db ${TEMPROOT}/etc/passwd ${TEMPROOT}/etc/pwd.db 530 |
| 531# We only need to compare things like freebsd.cf once 532find ${TEMPROOT}/usr/obj -type f -delete 533 |
|
| 531# Get ready to start comparing files 532 533# Check umask if not specified on the command line, 534# and we are not doing an autorun 535# 536if [ -z "${NEW_UMASK}" -a -z "${AUTO_RUN}" ]; then 537 USER_UMASK=`umask` 538 case "${USER_UMASK}" in --- 452 unchanged lines hidden --- | 534# Get ready to start comparing files 535 536# Check umask if not specified on the command line, 537# and we are not doing an autorun 538# 539if [ -z "${NEW_UMASK}" -a -z "${AUTO_RUN}" ]; then 540 USER_UMASK=`umask` 541 case "${USER_UMASK}" in --- 452 unchanged lines hidden --- |