| mergemaster.sh (174841) | mergemaster.sh (179315) |
|---|---|
| 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-2004 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-2004 Douglas Barton 9# DougB@FreeBSD.org 10 |
| 11# $FreeBSD: head/usr.sbin/mergemaster/mergemaster.sh 174841 2007-12-21 19:34:26Z dougb $ | 11# $FreeBSD: head/usr.sbin/mergemaster/mergemaster.sh 179315 2008-05-26 10:40:09Z bz $ |
| 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]' --- 645 unchanged lines hidden (view full) --- 665 echo '' 666fi 667 668CONFIRMED_UMASK=${NEW_UMASK:-0022} 669 670# 671# Warn users who still have old rc files 672# | 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]' --- 645 unchanged lines hidden (view full) --- 665 echo '' 666fi 667 668CONFIRMED_UMASK=${NEW_UMASK:-0022} 669 670# 671# Warn users who still have old rc files 672# |
| 673for file in atm devfs diskless1 diskless2 isdn network network6 pccard \ | 673for file in atm devfs diskless1 diskless2 network network6 pccard \ |
| 674 serial syscons sysctl alpha amd64 i386 ia64 sparc64; do 675 if [ -f "${DESTDIR}/etc/rc.${file}" ]; then 676 OLD_RC_PRESENT=1 677 break 678 fi 679done 680 681case "${OLD_RC_PRESENT}" in --- 9 unchanged lines hidden (view full) --- 691 '') 692 echo -n 'Move these files to /var/tmp/mergemaster/old_rc? [yes] ' 693 read MOVE_OLD_RC 694 695 case "${MOVE_OLD_RC}" in 696 [nN]*) ;; 697 *) 698 mkdir -p /var/tmp/mergemaster/old_rc | 674 serial syscons sysctl alpha amd64 i386 ia64 sparc64; do 675 if [ -f "${DESTDIR}/etc/rc.${file}" ]; then 676 OLD_RC_PRESENT=1 677 break 678 fi 679done 680 681case "${OLD_RC_PRESENT}" in --- 9 unchanged lines hidden (view full) --- 691 '') 692 echo -n 'Move these files to /var/tmp/mergemaster/old_rc? [yes] ' 693 read MOVE_OLD_RC 694 695 case "${MOVE_OLD_RC}" in 696 [nN]*) ;; 697 *) 698 mkdir -p /var/tmp/mergemaster/old_rc |
| 699 for file in atm devfs diskless1 diskless2 isdn network network6 pccard \ | 699 for file in atm devfs diskless1 diskless2 network network6 pccard \ |
| 700 serial syscons sysctl alpha amd64 i386 ia64 sparc64; do 701 if [ -f "${DESTDIR}/etc/rc.${file}" ]; then 702 mv ${DESTDIR}/etc/rc.${file} /var/tmp/mergemaster/old_rc/ 703 fi 704 done 705 echo ' The files have been moved' 706 press_to_continue 707 ;; --- 501 unchanged lines hidden --- | 700 serial syscons sysctl alpha amd64 i386 ia64 sparc64; do 701 if [ -f "${DESTDIR}/etc/rc.${file}" ]; then 702 mv ${DESTDIR}/etc/rc.${file} /var/tmp/mergemaster/old_rc/ 703 fi 704 done 705 echo ' The files have been moved' 706 press_to_continue 707 ;; --- 501 unchanged lines hidden --- |