| mergemaster.sh (77325) | mergemaster.sh (77326) |
|---|---|
| 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-2001 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-2001 Douglas Barton 9# DougB@FreeBSD.org 10 |
| 11# $FreeBSD: head/usr.sbin/mergemaster/mergemaster.sh 77325 2001-05-28 09:35:30Z dougb $ | 11# $FreeBSD: head/usr.sbin/mergemaster/mergemaster.sh 77326 2001-05-28 09:46:18Z 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 [-scrvahi] [-m /path]' 19 echo ' [-t /path] [-d] [-u N] [-w N] [-D /path]' --- 119 unchanged lines hidden (view full) --- 139 ;; 140 esac 141 fi 142 143 echo " Use 'd' to delete the temporary ${COMPFILE}" 144 echo " Use 'i' to install the temporary ${COMPFILE}" 145 case "${NO_INSTALLED}" in 146 '') | 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 [-scrvahi] [-m /path]' 19 echo ' [-t /path] [-d] [-u N] [-w N] [-D /path]' --- 119 unchanged lines hidden (view full) --- 139 ;; 140 esac 141 fi 142 143 echo " Use 'd' to delete the temporary ${COMPFILE}" 144 echo " Use 'i' to install the temporary ${COMPFILE}" 145 case "${NO_INSTALLED}" in 146 '') |
| 147 echo " Use 'm' to merge the old and new versions" 148 echo " Use 'v' to view to differences between the old and new versions again" | 147 echo " Use 'm' to merge the temporary and installed versions" 148 echo " Use 'v' to view the diff results again" |
| 149 ;; 150 esac 151 echo '' 152 echo " Default is to leave the temporary file to deal with by hand" 153 echo '' 154 echo -n "How should I deal with this? [Leave it for later] " 155 read HANDLE_COMPFILE 156 --- 725 unchanged lines hidden --- | 149 ;; 150 esac 151 echo '' 152 echo " Default is to leave the temporary file to deal with by hand" 153 echo '' 154 echo -n "How should I deal with this? [Leave it for later] " 155 read HANDLE_COMPFILE 156 --- 725 unchanged lines hidden --- |