| mergemaster.sh (101348) | mergemaster.sh (101362) |
|---|---|
| 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 101348 2002-08-05 01:03:12Z dougb $ | 11# $FreeBSD: head/usr.sbin/mergemaster/mergemaster.sh 101362 2002-08-05 08:47:52Z 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]' --- 373 unchanged lines hidden (view full) --- 393 esac 394fi 395 396# Define what CVS $Id tag to look for to aid portability. 397# 398CVS_ID_TAG=FreeBSD 399 400delete_temproot () { | 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]' --- 373 unchanged lines hidden (view full) --- 393 esac 394fi 395 396# Define what CVS $Id tag to look for to aid portability. 397# 398CVS_ID_TAG=FreeBSD 399 400delete_temproot () { |
| 401 rm -rf "${TEMPROOT}" 402 chflags -R 0 "${TEMPROOT}" 403 rm -rf "${TEMPROOT}" | 401 rm -rf "${TEMPROOT}" 2>/dev/null 402 chflags -R 0 "${TEMPROOT}" 2>/dev/null 403 rm -rf "${TEMPROOT}" || exit 1 |
| 404} 405 406case "${RERUN}" in 407'') 408 # Set up the loop to test for the existence of the 409 # temp root directory. 410 # 411 TEST_TEMP_ROOT=yes --- 621 unchanged lines hidden --- | 404} 405 406case "${RERUN}" in 407'') 408 # Set up the loop to test for the existence of the 409 # temp root directory. 410 # 411 TEST_TEMP_ROOT=yes --- 621 unchanged lines hidden --- |