| mergemaster.sh (96045) | mergemaster.sh (97380) |
|---|---|
| 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 96045 2002-05-04 22:45:12Z dougb $ | 11# $FreeBSD: head/usr.sbin/mergemaster/mergemaster.sh 97380 2002-05-28 07:25: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]' --- 354 unchanged lines hidden (view full) --- 374 '') SCREEN_WIDTH="${w}" ;; 375 "${w}") ;; # No-op, since they are the same 376 *) 377 echo -n "*** You entered ${SCREEN_WIDTH} as your screen width, but stty " 378 echo "thinks it is ${w}." 379 echo '' 380 echo -n "What would you like to use? [${w}] " 381 read SCREEN_WIDTH | 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]' --- 354 unchanged lines hidden (view full) --- 374 '') SCREEN_WIDTH="${w}" ;; 375 "${w}") ;; # No-op, since they are the same 376 *) 377 echo -n "*** You entered ${SCREEN_WIDTH} as your screen width, but stty " 378 echo "thinks it is ${w}." 379 echo '' 380 echo -n "What would you like to use? [${w}] " 381 read SCREEN_WIDTH |
| 382 case "${SCREEN_WIDTH}" in 383 '') SCREEN_WIDTH="${w}" ;; 384 esac |
|
| 382 ;; 383 esac 384 esac 385fi 386 387# Define what CVS $Id tag to look for to aid portability. 388# 389CVS_ID_TAG=FreeBSD --- 627 unchanged lines hidden --- | 385 ;; 386 esac 387 esac 388fi 389 390# Define what CVS $Id tag to look for to aid portability. 391# 392CVS_ID_TAG=FreeBSD --- 627 unchanged lines hidden --- |