| mergemaster.sh (202339) | mergemaster.sh (202340) |
|---|---|
| 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-2010 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-2010 Douglas Barton 9# DougB@FreeBSD.org 10 |
| 11# $FreeBSD: head/usr.sbin/mergemaster/mergemaster.sh 202339 2010-01-15 03:56:48Z dougb $ | 11# $FreeBSD: head/usr.sbin/mergemaster/mergemaster.sh 202340 2010-01-15 04:09:22Z 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 [-scrvahipFCPU]' 19 echo ' [-m /path] [-t /path] [-d] [-u N] [-w N] [-A arch] [-D /path]' --- 627 unchanged lines hidden (view full) --- 647 press_to_continue 648 diff -qr ${DESTDIR}/etc ${TEMPROOT}/etc | grep "^Only in ${DESTDIR}/etc" | ${PAGER} 649 echo '' 650 press_to_continue 651 ;; 652 esac 653 654 case "${IGNORE_MOTD}" in | 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 [-scrvahipFCPU]' 19 echo ' [-m /path] [-t /path] [-d] [-u N] [-w N] [-A arch] [-D /path]' --- 627 unchanged lines hidden (view full) --- 647 press_to_continue 648 diff -qr ${DESTDIR}/etc ${TEMPROOT}/etc | grep "^Only in ${DESTDIR}/etc" | ${PAGER} 649 echo '' 650 press_to_continue 651 ;; 652 esac 653 654 case "${IGNORE_MOTD}" in |
| 655 '') ;; |
|
| 655 *) 656 echo '' 657 echo "*** You have the IGNORE_MOTD option set in your mergemaster rc file." 658 echo " This option is deprecated in favor of the IGNORE_FILES option." 659 echo " Please update your rc file accordingly." 660 echo '' 661 exit 1 662 ;; --- 681 unchanged lines hidden --- | 656 *) 657 echo '' 658 echo "*** You have the IGNORE_MOTD option set in your mergemaster rc file." 659 echo " This option is deprecated in favor of the IGNORE_FILES option." 660 echo " Please update your rc file accordingly." 661 echo '' 662 exit 1 663 ;; --- 681 unchanged lines hidden --- |