| mergemaster.sh (186678) | mergemaster.sh (186688) |
|---|---|
| 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-2009 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-2009 Douglas Barton 9# DougB@FreeBSD.org 10 |
| 11# $FreeBSD: head/usr.sbin/mergemaster/mergemaster.sh 186678 2009-01-01 11:41:13Z dougb $ | 11# $FreeBSD: head/usr.sbin/mergemaster/mergemaster.sh 186688 2009-01-02 00:02:14Z 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 [-scrvahipCP] [-m /path]' 19 echo ' [-t /path] [-d] [-u N] [-w N] [-D /path]' --- 619 unchanged lines hidden (view full) --- 639 echo " Please update your rc file accordingly." 640 echo '' 641 press_to_continue 642 ;; 643 esac 644 645 # Avoid comparing the following user specified files 646 for file in ${IGNORE_FILES}; do | 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 [-scrvahipCP] [-m /path]' 19 echo ' [-t /path] [-d] [-u N] [-w N] [-D /path]' --- 619 unchanged lines hidden (view full) --- 639 echo " Please update your rc file accordingly." 640 echo '' 641 press_to_continue 642 ;; 643 esac 644 645 # Avoid comparing the following user specified files 646 for file in ${IGNORE_FILES}; do |
| 647 test -e ${file} && unlink ${file} | 647 test -e ${TEMPROOT}/${file} && unlink ${TEMPROOT}/${file} |
| 648 done 649 ;; # End of the "RERUN" test 650esac 651 652# We really don't want to have to deal with files like login.conf.db, pwd.db, 653# or spwd.db. Instead, we want to compare the text versions, and run *_mkdb. 654# Prompt the user to do so below, as needed. 655# --- 588 unchanged lines hidden --- | 648 done 649 ;; # End of the "RERUN" test 650esac 651 652# We really don't want to have to deal with files like login.conf.db, pwd.db, 653# or spwd.db. Instead, we want to compare the text versions, and run *_mkdb. 654# Prompt the user to do so below, as needed. 655# --- 588 unchanged lines hidden --- |