mergemaster.sh revision 200708
152400Sbillf#!/bin/sh 252400Sbillf 352400Sbillf# mergemaster 452400Sbillf 552400Sbillf# Compare files created by /usr/src/etc/Makefile (or the directory 652400Sbillf# the user specifies) with the currently installed copies. 752400Sbillf 8186678Sdougb# Copyright 1998-2009 Douglas Barton 973651Sdougb# DougB@FreeBSD.org 1052400Sbillf 1152495Sbillf# $FreeBSD: head/usr.sbin/mergemaster/mergemaster.sh 200708 2009-12-19 05:20:26Z dougb $ 1252400Sbillf 1368507SdougbPATH=/bin:/usr/bin:/usr/sbin 1452400Sbillf 1552400Sbillfdisplay_usage () { 1652533Sbillf VERSION_NUMBER=`grep "[$]FreeBSD:" $0 | cut -d ' ' -f 4` 1752400Sbillf echo "mergemaster version ${VERSION_NUMBER}" 18189992Sdougb echo 'Usage: mergemaster [-scrvahipFCPU]' 19189763Sdougb echo ' [-m /path] [-t /path] [-d] [-u N] [-w N] [-A arch] [-D /path]' 2052400Sbillf echo "Options:" 2152400Sbillf echo " -s Strict comparison (diff every pair of files)" 2252400Sbillf echo " -c Use context diff instead of unified diff" 2352400Sbillf echo " -r Re-run on a previously cleaned directory (skip temproot creation)" 2452400Sbillf echo " -v Be more verbose about the process, include additional checks" 2552400Sbillf echo " -a Leave all files that differ to merge by hand" 2652400Sbillf echo " -h Display more complete help" 2767949Sdougb echo ' -i Automatically install files that do not exist in destination directory' 2891193Sdougb echo ' -p Pre-buildworld mode, only compares crucial files' 29190320Sdougb echo ' -F Install files that differ only by revision control Id ($FreeBSD)' 3091193Sdougb echo ' -C Compare local rc.conf variables to the defaults' 31114501Sdougb echo ' -P Preserve files that are overwritten' 32189763Sdougb echo " -U Attempt to auto upgrade files that have not been user modified" 33189763Sdougb echo '' 3452400Sbillf echo " -m /path/directory Specify location of source to do the make in" 3552400Sbillf echo " -t /path/directory Specify temp root directory" 3652400Sbillf echo " -d Add date and time to directory name (e.g., /var/tmp/temproot.`date +%m%d.%H.%M`)" 3752400Sbillf echo " -u N Specify a numeric umask" 3852400Sbillf echo " -w N Specify a screen width in columns to sdiff" 39155309Srwatson echo " -A architecture Alternative architecture name to pass to make" 4067949Sdougb echo ' -D /path/directory Specify the destination directory to install files to' 4152400Sbillf echo '' 4252400Sbillf} 4352400Sbillf 4452400Sbillfdisplay_help () { 4552400Sbillf echo "* To specify a directory other than /var/tmp/temproot for the" 4652400Sbillf echo " temporary root environment, use -t /path/to/temp/root" 4752400Sbillf echo "* The -w option takes a number as an argument for the column width" 4867859Sdougb echo " of the screen. The default is 80." 4967949Sdougb echo '* The -a option causes mergemaster to run without prompting.' 5052400Sbillf} 5152400Sbillf 5258910Salfred# Loop allowing the user to use sdiff to merge files and display the merged 5358910Salfred# file. 5458910Salfredmerge_loop () { 5567850Sdougb case "${VERBOSE}" in 5667850Sdougb '') ;; 5767850Sdougb *) 5867850Sdougb echo " *** Type h at the sdiff prompt (%) to get usage help" 5967850Sdougb ;; 6067850Sdougb esac 6167850Sdougb echo '' 6267850Sdougb MERGE_AGAIN=yes 6367850Sdougb while [ "${MERGE_AGAIN}" = "yes" ]; do 6467850Sdougb # Prime file.merged so we don't blat the owner/group id's 6567850Sdougb cp -p "${COMPFILE}" "${COMPFILE}.merged" 6667850Sdougb sdiff -o "${COMPFILE}.merged" --text --suppress-common-lines \ 6767949Sdougb --width=${SCREEN_WIDTH:-80} "${DESTDIR}${COMPFILE#.}" "${COMPFILE}" 6867850Sdougb INSTALL_MERGED=V 6967850Sdougb while [ "${INSTALL_MERGED}" = "v" -o "${INSTALL_MERGED}" = "V" ]; do 7067850Sdougb echo '' 7167850Sdougb echo " Use 'i' to install merged file" 7267850Sdougb echo " Use 'r' to re-do the merge" 7367850Sdougb echo " Use 'v' to view the merged file" 7467850Sdougb echo " Default is to leave the temporary file to deal with by hand" 7567850Sdougb echo '' 7667859Sdougb echo -n " *** How should I deal with the merged file? [Leave it for later] " 7767859Sdougb read INSTALL_MERGED 7858910Salfred 7967850Sdougb case "${INSTALL_MERGED}" in 8067850Sdougb [iI]) 8167850Sdougb mv "${COMPFILE}.merged" "${COMPFILE}" 8267850Sdougb echo '' 8367850Sdougb if mm_install "${COMPFILE}"; then 8467850Sdougb echo " *** Merged version of ${COMPFILE} installed successfully" 8567859Sdougb else 8667850Sdougb echo " *** Problem installing ${COMPFILE}, it will remain to merge by hand later" 8767859Sdougb fi 8867850Sdougb unset MERGE_AGAIN 8967850Sdougb ;; 9067850Sdougb [rR]) 9167850Sdougb rm "${COMPFILE}.merged" 9267859Sdougb ;; 9367850Sdougb [vV]) 9467850Sdougb ${PAGER} "${COMPFILE}.merged" 9567850Sdougb ;; 9667850Sdougb '') 9767850Sdougb echo " *** ${COMPFILE} will remain for your consideration" 9867850Sdougb unset MERGE_AGAIN 9967850Sdougb ;; 10067850Sdougb *) 10167850Sdougb echo "invalid choice: ${INSTALL_MERGED}" 10267850Sdougb INSTALL_MERGED=V 10367850Sdougb ;; 10467850Sdougb esac 10567850Sdougb done 10667850Sdougb done 10758910Salfred} 10858910Salfred 10958910Salfred# Loop showing user differences between files, allow merge, skip or install 11058910Salfred# options 11158910Salfreddiff_loop () { 11258910Salfred 11367850Sdougb HANDLE_COMPFILE=v 11458910Salfred 11577323Sdougb while [ "${HANDLE_COMPFILE}" = "v" -o "${HANDLE_COMPFILE}" = "V" -o \ 11677323Sdougb "${HANDLE_COMPFILE}" = "NOT V" ]; do 11767949Sdougb if [ -f "${DESTDIR}${COMPFILE#.}" -a -f "${COMPFILE}" ]; then 118192230Sdougb if [ -n "${AUTO_UPGRADE}" -a -n "${CHANGED}" ]; then 119192230Sdougb case "${CHANGED}" in 120192230Sdougb *:${DESTDIR}${COMPFILE#.}:*) ;; # File has been modified 121192230Sdougb *) 122158149Sgordon echo '' 123158149Sgordon echo " *** ${COMPFILE} has not been user modified." 124158149Sgordon echo '' 125158149Sgordon 126158149Sgordon if mm_install "${COMPFILE}"; then 127158149Sgordon echo " *** ${COMPFILE} upgraded successfully" 128158149Sgordon echo '' 129158149Sgordon # Make the list print one file per line 130158149Sgordon AUTO_UPGRADED_FILES="${AUTO_UPGRADED_FILES} ${DESTDIR}${COMPFILE#.} 131158149Sgordon" 132158149Sgordon else 133192230Sdougb echo " *** Problem upgrading ${COMPFILE}, it will remain to merge by hand" 134158149Sgordon fi 135158149Sgordon return 136192230Sdougb ;; 137192230Sdougb esac 138158149Sgordon fi 13967850Sdougb if [ "${HANDLE_COMPFILE}" = "v" -o "${HANDLE_COMPFILE}" = "V" ]; then 14090564Sdougb echo '' 141109993Sdillon echo ' ====================================================================== ' 142109993Sdillon echo '' 143109993Sdillon ( 144109993Sdillon echo " *** Displaying differences between ${COMPFILE} and installed version:" 145109993Sdillon echo '' 146110377Sdougb diff ${DIFF_FLAG} ${DIFF_OPTIONS} "${DESTDIR}${COMPFILE#.}" "${COMPFILE}" 147109993Sdillon ) | ${PAGER} 148109993Sdillon echo '' 14967850Sdougb fi 15067850Sdougb else 151109993Sdillon echo '' 15267850Sdougb echo " *** There is no installed version of ${COMPFILE}" 15391193Sdougb echo '' 15467949Sdougb case "${AUTO_INSTALL}" in 15567949Sdougb [Yy][Ee][Ss]) 15667949Sdougb echo '' 15767949Sdougb if mm_install "${COMPFILE}"; then 15867949Sdougb echo " *** ${COMPFILE} installed successfully" 15968507Sdougb echo '' 16067949Sdougb # Make the list print one file per line 16167949Sdougb AUTO_INSTALLED_FILES="${AUTO_INSTALLED_FILES} ${DESTDIR}${COMPFILE#.} 16267949Sdougb" 16367949Sdougb else 16467949Sdougb echo " *** Problem installing ${COMPFILE}, it will remain to merge by hand" 16567949Sdougb fi 16667949Sdougb return 16767949Sdougb ;; 16867949Sdougb *) 16967949Sdougb NO_INSTALLED=yes 17067949Sdougb ;; 17167949Sdougb esac 17267850Sdougb fi 17367859Sdougb 17467850Sdougb echo " Use 'd' to delete the temporary ${COMPFILE}" 17567850Sdougb echo " Use 'i' to install the temporary ${COMPFILE}" 17667850Sdougb case "${NO_INSTALLED}" in 17767850Sdougb '') 17877326Sdougb echo " Use 'm' to merge the temporary and installed versions" 179109993Sdillon echo " Use 'v' to view the diff results again" 18067850Sdougb ;; 18167850Sdougb esac 18267850Sdougb echo '' 18367850Sdougb echo " Default is to leave the temporary file to deal with by hand" 18467850Sdougb echo '' 18567859Sdougb echo -n "How should I deal with this? [Leave it for later] " 18667859Sdougb read HANDLE_COMPFILE 18767859Sdougb 18867850Sdougb case "${HANDLE_COMPFILE}" in 18967850Sdougb [dD]) 19067850Sdougb rm "${COMPFILE}" 19167850Sdougb echo '' 19267850Sdougb echo " *** Deleting ${COMPFILE}" 19367850Sdougb ;; 19467850Sdougb [iI]) 19567850Sdougb echo '' 19667850Sdougb if mm_install "${COMPFILE}"; then 19767850Sdougb echo " *** ${COMPFILE} installed successfully" 19867850Sdougb else 19967850Sdougb echo " *** Problem installing ${COMPFILE}, it will remain to merge by hand" 20067850Sdougb fi 20167850Sdougb ;; 20267850Sdougb [mM]) 20367850Sdougb case "${NO_INSTALLED}" in 20467850Sdougb '') 20567850Sdougb # interact with user to merge files 20667850Sdougb merge_loop 20767850Sdougb ;; 20867850Sdougb *) 20967850Sdougb echo '' 21067850Sdougb echo " *** There is no installed version of ${COMPFILE}" 21167850Sdougb echo '' 21267850Sdougb HANDLE_COMPFILE="NOT V" 21367850Sdougb ;; 21467850Sdougb esac # End of "No installed version of file but user selected merge" test 21567850Sdougb ;; 21667850Sdougb [vV]) 21767850Sdougb continue 21867850Sdougb ;; 21967850Sdougb '') 22067850Sdougb echo '' 22167850Sdougb echo " *** ${COMPFILE} will remain for your consideration" 22267850Sdougb ;; 22367850Sdougb *) 22467850Sdougb # invalid choice, show menu again. 22567850Sdougb echo "invalid choice: ${HANDLE_COMPFILE}" 22667850Sdougb echo '' 22767850Sdougb HANDLE_COMPFILE="NOT V" 22867850Sdougb continue 22967850Sdougb ;; 23067850Sdougb esac # End of "How to handle files that are different" 23167859Sdougb done 23267850Sdougb unset NO_INSTALLED 23367850Sdougb echo '' 23467850Sdougb case "${VERBOSE}" in 23567850Sdougb '') ;; 23667850Sdougb *) 23767850Sdougb sleep 3 23867850Sdougb ;; 23967850Sdougb esac 24058910Salfred} 24158910Salfred 24297960Sdougbpress_to_continue () { 24397960Sdougb local DISCARD 24497960Sdougb echo -n ' *** Press the [Enter] or [Return] key to continue ' 24597960Sdougb read DISCARD 24697960Sdougb} 24797960Sdougb 24852400Sbillf# Set the default path for the temporary root environment 24952400Sbillf# 25052400SbillfTEMPROOT='/var/tmp/temproot' 25152400Sbillf 25273651Sdougb# Read /etc/mergemaster.rc first so the one in $HOME can override 25373651Sdougb# 25473651Sdougbif [ -r /etc/mergemaster.rc ]; then 25573651Sdougb . /etc/mergemaster.rc 25673651Sdougbfi 25773651Sdougb 25852400Sbillf# Read .mergemasterrc before command line so CLI can override 25952400Sbillf# 26067949Sdougbif [ -r "$HOME/.mergemasterrc" ]; then 26152400Sbillf . "$HOME/.mergemasterrc" 26252400Sbillffi 26352400Sbillf 264186678Sdougb# Assign the location of the mtree database 265186678Sdougb# 266200416SdougbMTREEDB=${MTREEDB:-${DESTDIR}/var/db} 267186678SdougbMTREEFILE="${MTREEDB}/mergemaster.mtree" 268186678Sdougb 26952400Sbillf# Check the command line options 27052400Sbillf# 271189992Sdougbwhile getopts ":ascrvhipCPm:t:du:w:D:A:FU" COMMAND_LINE_ARGUMENT ; do 27252400Sbillf case "${COMMAND_LINE_ARGUMENT}" in 273155309Srwatson A) 274186678Sdougb ARCHSTRING='TARGET_ARCH='${OPTARG} 275155309Srwatson ;; 276189992Sdougb F) 277189992Sdougb FREEBSD_ID=yes 278189992Sdougb ;; 279158149Sgordon U) 280158149Sgordon AUTO_UPGRADE=yes 281158149Sgordon ;; 28252400Sbillf s) 28352400Sbillf STRICT=yes 284110377Sdougb unset DIFF_OPTIONS 28552400Sbillf ;; 28652400Sbillf c) 28752400Sbillf DIFF_FLAG='-c' 28852400Sbillf ;; 28952400Sbillf r) 29052400Sbillf RERUN=yes 29152400Sbillf ;; 29252400Sbillf v) 29352400Sbillf case "${AUTO_RUN}" in 29452400Sbillf '') VERBOSE=yes ;; 29552400Sbillf esac 29652400Sbillf ;; 29752400Sbillf a) 29852400Sbillf AUTO_RUN=yes 29952400Sbillf unset VERBOSE 30052400Sbillf ;; 30152400Sbillf h) 30252400Sbillf display_usage 30352400Sbillf display_help 30452400Sbillf exit 0 30552400Sbillf ;; 30667949Sdougb i) 30767949Sdougb AUTO_INSTALL=yes 30867949Sdougb ;; 30996045Sdougb C) 31096045Sdougb COMP_CONFS=yes 31196045Sdougb ;; 312114501Sdougb P) 313114501Sdougb PRESERVE_FILES=yes 314114501Sdougb ;; 31591193Sdougb p) 31691193Sdougb PRE_WORLD=yes 31796045Sdougb unset COMP_CONFS 31896045Sdougb unset AUTO_RUN 31991193Sdougb ;; 32052400Sbillf m) 32152400Sbillf SOURCEDIR=${OPTARG} 32252400Sbillf ;; 32352400Sbillf t) 32452400Sbillf TEMPROOT=${OPTARG} 32552400Sbillf ;; 32652400Sbillf d) 32752400Sbillf TEMPROOT=${TEMPROOT}.`date +%m%d.%H.%M` 32852400Sbillf ;; 32952400Sbillf u) 33052400Sbillf NEW_UMASK=${OPTARG} 33152400Sbillf ;; 33252400Sbillf w) 33352400Sbillf SCREEN_WIDTH=${OPTARG} 33452400Sbillf ;; 33567949Sdougb D) 33667949Sdougb DESTDIR=${OPTARG} 33767949Sdougb ;; 33852400Sbillf *) 33952400Sbillf display_usage 34052400Sbillf exit 1 34152400Sbillf ;; 34252400Sbillf esac 34352400Sbillfdone 34452400Sbillf 345114501Sdougb# Don't force the user to set this in the mergemaster rc file 346114501Sdougbif [ -n "${PRESERVE_FILES}" -a -z "${PRESERVE_FILES_DIR}" ]; then 347114501Sdougb PRESERVE_FILES_DIR=/var/tmp/mergemaster/preserved-files-`date +%y%m%d-%H%M%S` 348200425Sdougb mkdir -p ${PRESERVE_FILES_DIR} 349114501Sdougbfi 350114501Sdougb 351186678Sdougb# Check for the mtree database in DESTDIR 352186678Sdougbcase "${AUTO_UPGRADE}" in 353186678Sdougb'') ;; # If the option is not set no need to run the test or warn the user 354186678Sdougb*) 355200416Sdougb if [ ! -s "${MTREEFILE}" ]; then 356186678Sdougb echo '' 357200416Sdougb echo "*** Unable to find mtree database (${MTREEFILE})." 358200416Sdougb echo " Skipping auto-upgrade on this run." 359193853Sdougb echo " It will be created for the next run when this one is complete." 360186678Sdougb echo '' 361186678Sdougb press_to_continue 362186678Sdougb unset AUTO_UPGRADE 363186678Sdougb fi 364186678Sdougb ;; 365186678Sdougbesac 366186678Sdougb 367186689Sdougbif [ -e "${DESTDIR}/etc/fstab" ]; then 368186689Sdougb if grep -q nodev ${DESTDIR}/etc/fstab; then 369186689Sdougb echo '' 370186689Sdougb echo "*** You have the deprecated 'nodev' option in ${DESTDIR}/etc/fstab." 371186689Sdougb echo " This can prevent the filesystem from being mounted on reboot." 372186689Sdougb echo " Please update your fstab before continuing." 373186689Sdougb echo " See fstab(5) for more information." 374186689Sdougb echo '' 375186689Sdougb exit 1 376186689Sdougb fi 377158149Sgordonfi 378158149Sgordon 37952400Sbillfecho '' 38052400Sbillf 38152400Sbillf# If the user has a pager defined, make sure we can run it 38252400Sbillf# 38352400Sbillfcase "${DONT_CHECK_PAGER}" in 38452400Sbillf'') 385186695Sdougbcheck_pager () { 386186695Sdougb while ! type "${PAGER%% *}" >/dev/null; do 38752400Sbillf echo " *** Your PAGER environment variable specifies '${PAGER}', but" 38864467Sbrian echo " due to the limited PATH that I use for security reasons," 38967859Sdougb echo " I cannot execute it. So, what would you like to do?" 39052400Sbillf echo '' 39152400Sbillf echo " Use 'e' to exit mergemaster and fix your PAGER variable" 39264467Sbrian if [ -x /usr/bin/less -o -x /usr/local/bin/less ]; then 39364467Sbrian echo " Use 'l' to set PAGER to 'less' for this run" 39452400Sbillf fi 39552400Sbillf echo " Use 'm' to use plain old 'more' as your PAGER for this run" 39652400Sbillf echo '' 39752400Sbillf echo " Default is to use plain old 'more' " 39852400Sbillf echo '' 39967859Sdougb echo -n "What should I do? [Use 'more'] " 40067859Sdougb read FIXPAGER 40167859Sdougb 40252400Sbillf case "${FIXPAGER}" in 40358910Salfred [eE]) 40452400Sbillf exit 0 40552400Sbillf ;; 40658910Salfred [lL]) 40764467Sbrian if [ -x /usr/bin/less ]; then 40864467Sbrian PAGER=/usr/bin/less 40964467Sbrian elif [ -x /usr/local/bin/less ]; then 41058910Salfred PAGER=/usr/local/bin/less 41164467Sbrian else 41264467Sbrian echo '' 41364467Sbrian echo " *** Fatal Error:" 41464467Sbrian echo " You asked to use 'less' as your pager, but I can't" 41564467Sbrian echo " find it in /usr/bin or /usr/local/bin" 41664467Sbrian exit 1 41758910Salfred fi 41852400Sbillf ;; 41960420Sbsd [mM]|'') 42052400Sbillf PAGER=more 42152400Sbillf ;; 42258910Salfred *) 42358910Salfred echo '' 42458910Salfred echo "invalid choice: ${FIXPAGER}" 42552400Sbillf esac 42652400Sbillf echo '' 42758910Salfred done 428186695Sdougb} 429186695Sdougb if [ -n "${PAGER}" ]; then 430186695Sdougb check_pager 431186695Sdougb fi 43252400Sbillf ;; 43352400Sbillfesac 43452400Sbillf 43552400Sbillf# If user has a pager defined, or got assigned one above, use it. 43652400Sbillf# If not, use more. 43752400Sbillf# 43852400SbillfPAGER=${PAGER:-more} 43952400Sbillf 44052400Sbillfif [ -n "${VERBOSE}" -a ! "${PAGER}" = "more" ]; then 44152400Sbillf echo " *** You have ${PAGER} defined as your pager so we will use that" 44252400Sbillf echo '' 44352400Sbillf sleep 3 44452400Sbillffi 44552400Sbillf 44652400Sbillf# Assign the diff flag once so we will not have to keep testing it 44752400Sbillf# 44852400SbillfDIFF_FLAG=${DIFF_FLAG:--u} 44952400Sbillf 45052400Sbillf# Assign the source directory 45152400Sbillf# 452186678SdougbSOURCEDIR=${SOURCEDIR:-/usr/src} 453186678Sdougbif [ ! -f ${SOURCEDIR}/Makefile.inc1 -a \ 454186678Sdougb -f ${SOURCEDIR}/../Makefile.inc1 ]; then 455186678Sdougb echo " *** The source directory you specified (${SOURCEDIR})" 456186678Sdougb echo " will be reset to ${SOURCEDIR}/.." 457186678Sdougb echo '' 458186678Sdougb sleep 3 459186678Sdougb SOURCEDIR=${SOURCEDIR}/.. 460186678Sdougbfi 46152400Sbillf 462186678Sdougb# Setup make to use system files from SOURCEDIR 463186695SdougbMM_MAKE="make ${ARCHSTRING} -m ${SOURCEDIR}/share/mk" 464186678Sdougb 465158149Sgordon# Check DESTDIR against the mergemaster mtree database to see what 466158149Sgordon# files the user changed from the reference files. 467158149Sgordon# 468200416Sdougbif [ -n "${AUTO_UPGRADE}" -a -s "${MTREEFILE}" ]; then 469192230Sdougb CHANGED=: 470200416Sdougb for file in `mtree -eqL -f ${MTREEFILE} -p ${DESTDIR}/ \ 471158149Sgordon 2>/dev/null | awk '($2 == "changed") {print $1}'`; do 472158149Sgordon if [ -f "${DESTDIR}/$file" ]; then 473192230Sdougb CHANGED="${CHANGED}${DESTDIR}/${file}:" 474158149Sgordon fi 475158149Sgordon done 476192230Sdougb [ "$CHANGED" = ':' ] && unset CHANGED 477158149Sgordonfi 478158149Sgordon 47996045Sdougb# Check the width of the user's terminal 48096045Sdougb# 48196045Sdougbif [ -t 0 ]; then 482110377Sdougb w=`tput columns` 48396045Sdougb case "${w}" in 48496045Sdougb 0|'') ;; # No-op, since the input is not valid 48596045Sdougb *) 48696045Sdougb case "${SCREEN_WIDTH}" in 48796045Sdougb '') SCREEN_WIDTH="${w}" ;; 48896045Sdougb "${w}") ;; # No-op, since they are the same 48996045Sdougb *) 49096045Sdougb echo -n "*** You entered ${SCREEN_WIDTH} as your screen width, but stty " 49196045Sdougb echo "thinks it is ${w}." 49296045Sdougb echo '' 49396045Sdougb echo -n "What would you like to use? [${w}] " 49496045Sdougb read SCREEN_WIDTH 49597380Sdougb case "${SCREEN_WIDTH}" in 49697380Sdougb '') SCREEN_WIDTH="${w}" ;; 49797380Sdougb esac 49896045Sdougb ;; 49996045Sdougb esac 50096045Sdougb esac 50196045Sdougbfi 50296045Sdougb 50373651Sdougb# Define what CVS $Id tag to look for to aid portability. 50473651Sdougb# 50573651SdougbCVS_ID_TAG=FreeBSD 50673651Sdougb 50799152Sdougbdelete_temproot () { 508101362Sdougb rm -rf "${TEMPROOT}" 2>/dev/null 509101362Sdougb chflags -R 0 "${TEMPROOT}" 2>/dev/null 510101362Sdougb rm -rf "${TEMPROOT}" || exit 1 51199152Sdougb} 51299152Sdougb 51352400Sbillfcase "${RERUN}" in 51452400Sbillf'') 51552400Sbillf # Set up the loop to test for the existence of the 51652400Sbillf # temp root directory. 51752400Sbillf # 51852400Sbillf TEST_TEMP_ROOT=yes 51952400Sbillf while [ "${TEST_TEMP_ROOT}" = "yes" ]; do 52052400Sbillf if [ -d "${TEMPROOT}" ]; then 52152400Sbillf echo "*** The directory specified for the temporary root environment," 52267859Sdougb echo " ${TEMPROOT}, exists. This can be a security risk if untrusted" 52352400Sbillf echo " users have access to the system." 52452400Sbillf echo '' 52552400Sbillf case "${AUTO_RUN}" in 52652400Sbillf '') 52752400Sbillf echo " Use 'd' to delete the old ${TEMPROOT} and continue" 52852400Sbillf echo " Use 't' to select a new temporary root directory" 52952400Sbillf echo " Use 'e' to exit mergemaster" 53052400Sbillf echo '' 53152400Sbillf echo " Default is to use ${TEMPROOT} as is" 53252400Sbillf echo '' 53367859Sdougb echo -n "How should I deal with this? [Use the existing ${TEMPROOT}] " 53467859Sdougb read DELORNOT 53567859Sdougb 53667859Sdougb case "${DELORNOT}" in 53767859Sdougb [dD]) 53867859Sdougb echo '' 53967859Sdougb echo " *** Deleting the old ${TEMPROOT}" 54067859Sdougb echo '' 54199152Sdougb delete_temproot || exit 1 54267859Sdougb unset TEST_TEMP_ROOT 54352400Sbillf ;; 54467859Sdougb [tT]) 54567859Sdougb echo " *** Enter new directory name for temporary root environment" 54667859Sdougb read TEMPROOT 54767859Sdougb ;; 54867859Sdougb [eE]) 54967859Sdougb exit 0 55067859Sdougb ;; 55167859Sdougb '') 55267859Sdougb echo '' 55367859Sdougb echo " *** Leaving ${TEMPROOT} intact" 55467859Sdougb echo '' 55567859Sdougb unset TEST_TEMP_ROOT 55667859Sdougb ;; 55767859Sdougb *) 55867859Sdougb echo '' 55967859Sdougb echo "invalid choice: ${DELORNOT}" 56067859Sdougb echo '' 56167859Sdougb ;; 56267859Sdougb esac 56367859Sdougb ;; 56452400Sbillf *) 56577323Sdougb # If this is an auto-run, try a hopefully safe alternative then 56677323Sdougb # re-test anyway. 56752400Sbillf TEMPROOT=/var/tmp/temproot.`date +%m%d.%H.%M.%S` 56852400Sbillf ;; 56952400Sbillf esac 57052400Sbillf else 57152400Sbillf unset TEST_TEMP_ROOT 57252400Sbillf fi 57352400Sbillf done 57452400Sbillf 57552400Sbillf echo "*** Creating the temporary root environment in ${TEMPROOT}" 57652400Sbillf 57752400Sbillf if mkdir -p "${TEMPROOT}"; then 57852400Sbillf echo " *** ${TEMPROOT} ready for use" 57952400Sbillf fi 58052400Sbillf 58152400Sbillf if [ ! -d "${TEMPROOT}" ]; then 58252400Sbillf echo '' 58352400Sbillf echo " *** FATAL ERROR: Cannot create ${TEMPROOT}" 58452400Sbillf echo '' 58552400Sbillf exit 1 58652400Sbillf fi 58752400Sbillf 58852400Sbillf echo " *** Creating and populating directory structure in ${TEMPROOT}" 58952400Sbillf echo '' 59052400Sbillf 59152400Sbillf case "${VERBOSE}" in 59252400Sbillf '') ;; 59352400Sbillf *) 59497960Sdougb press_to_continue 59552400Sbillf ;; 59652400Sbillf esac 59752400Sbillf 59891193Sdougb case "${PRE_WORLD}" in 59991193Sdougb '') 60091193Sdougb { cd ${SOURCEDIR} && 60191193Sdougb case "${DESTDIR}" in 60291193Sdougb '') ;; 60391193Sdougb *) 604186695Sdougb ${MM_MAKE} DESTDIR=${DESTDIR} distrib-dirs 60591193Sdougb ;; 60691193Sdougb esac 607186749Sdougb od=${TEMPROOT}/usr/obj 608186695Sdougb ${MM_MAKE} DESTDIR=${TEMPROOT} distrib-dirs && 609186749Sdougb MAKEOBJDIRPREFIX=$od ${MM_MAKE} _obj SUBDIR_OVERRIDE=etc && 610186749Sdougb MAKEOBJDIRPREFIX=$od ${MM_MAKE} everything SUBDIR_OVERRIDE=etc && 611186749Sdougb MAKEOBJDIRPREFIX=$od ${MM_MAKE} DESTDIR=${TEMPROOT} distribution;} || 61291193Sdougb { echo ''; 61391193Sdougb echo " *** FATAL ERROR: Cannot 'cd' to ${SOURCEDIR} and install files to"; 61491193Sdougb echo " the temproot environment"; 61591193Sdougb echo ''; 61691193Sdougb exit 1;} 61791193Sdougb ;; 61891193Sdougb *) 61991193Sdougb # Only set up files that are crucial to {build|install}world 62091193Sdougb { mkdir -p ${TEMPROOT}/etc && 621186678Sdougb cp -p ${SOURCEDIR}/etc/master.passwd ${TEMPROOT}/etc && 622186678Sdougb cp -p ${SOURCEDIR}/etc/group ${TEMPROOT}/etc;} || 62391193Sdougb { echo ''; 62491193Sdougb echo ' *** FATAL ERROR: Cannot copy files to the temproot environment'; 62591193Sdougb echo ''; 62691193Sdougb exit 1;} 62791193Sdougb ;; 62891193Sdougb esac 62952400Sbillf 63077323Sdougb # Doing the inventory and removing files that we don't want to compare only 63177323Sdougb # makes sense if we are not doing a rerun, since we have no way of knowing 63277323Sdougb # what happened to the files during previous incarnations. 63367949Sdougb case "${VERBOSE}" in 63467949Sdougb '') ;; 63567949Sdougb *) 63667949Sdougb echo '' 63767949Sdougb echo ' *** The following files exist only in the installed version of' 63867949Sdougb echo " ${DESTDIR}/etc. In the vast majority of cases these files" 63967949Sdougb echo ' are necessary parts of the system and should not be deleted.' 64067949Sdougb echo ' However because these files are not updated by this process you' 64167949Sdougb echo ' might want to verify their status before rebooting your system.' 64267949Sdougb echo '' 64397960Sdougb press_to_continue 644101348Sdougb diff -qr ${DESTDIR}/etc ${TEMPROOT}/etc | grep "^Only in ${DESTDIR}/etc" | ${PAGER} 64567949Sdougb echo '' 64697960Sdougb press_to_continue 64767949Sdougb ;; 64867949Sdougb esac 64967949Sdougb 65052534Sbillf # Avoid comparing the motd if the user specifies it in .mergemasterrc 651186678Sdougb # Compatibility shim to be removed in FreeBSD 9.x 65252534Sbillf case "${IGNORE_MOTD}" in 65352534Sbillf '') ;; 654186678Sdougb *) IGNORE_FILES="${IGNORE_FILES} /etc/motd" 655186678Sdougb echo '' 656186678Sdougb echo "*** You have the IGNORE_MOTD option set in your mergemaster rc file." 657186678Sdougb echo " This option is deprecated in favor of the IGNORE_FILES option." 658186678Sdougb echo " Please update your rc file accordingly." 659186678Sdougb echo '' 660186678Sdougb press_to_continue 66152534Sbillf ;; 66252534Sbillf esac 66352534Sbillf 664186678Sdougb # Avoid comparing the following user specified files 665186678Sdougb for file in ${IGNORE_FILES}; do 666186688Sdougb test -e ${TEMPROOT}/${file} && unlink ${TEMPROOT}/${file} 667186678Sdougb done 66852400Sbillf ;; # End of the "RERUN" test 66952400Sbillfesac 67052400Sbillf 671111901Sdougb# We really don't want to have to deal with files like login.conf.db, pwd.db, 672111901Sdougb# or spwd.db. Instead, we want to compare the text versions, and run *_mkdb. 673111901Sdougb# Prompt the user to do so below, as needed. 67477478Sdougb# 675111905Sdougbrm -f ${TEMPROOT}/etc/*.db ${TEMPROOT}/etc/passwd 67677478Sdougb 67794196Sdougb# We only need to compare things like freebsd.cf once 67896045Sdougbfind ${TEMPROOT}/usr/obj -type f -delete 2>/dev/null 67994196Sdougb 680193853Sdougb# Delete stuff we do not need to keep the mtree database small, 681193853Sdougb# and to make the actual comparison faster. 682193853Sdougbfind ${TEMPROOT}/usr -type l -delete 2>/dev/null 683158149Sgordonfind ${TEMPROOT} -type f -size 0 -delete 2>/dev/null 684193853Sdougbfind -d ${TEMPROOT} -type d -empty -delete 2>/dev/null 685158149Sgordon 686158149Sgordon# Build the mtree database in a temporary location. 687186678SdougbMTREENEW=`mktemp -t mergemaster.mtree` 688158149Sgordoncase "${PRE_WORLD}" in 689189761Sdougb'') mtree -ci -p ${TEMPROOT} -k size,md5digest > ${MTREENEW} 2>/dev/null 690158149Sgordon ;; 691158149Sgordon*) # We don't want to mess with the mtree database on a pre-world run. 692158149Sgordon ;; 693158149Sgordonesac 694158149Sgordon 69552400Sbillf# Get ready to start comparing files 69652400Sbillf 69798084Sdougb# Check umask if not specified on the command line, 69898084Sdougb# and we are not doing an autorun 69952400Sbillf# 70098084Sdougbif [ -z "${NEW_UMASK}" -a -z "${AUTO_RUN}" ]; then 70198084Sdougb USER_UMASK=`umask` 70252400Sbillf case "${USER_UMASK}" in 70377335Sdougb 0022|022) ;; 70452400Sbillf *) 70552400Sbillf echo '' 70698084Sdougb echo " *** Your umask is currently set to ${USER_UMASK}. By default, this script" 70798084Sdougb echo " installs all files with the same user, group and modes that" 708186678Sdougb echo " they are created with by ${SOURCEDIR}/etc/Makefile, compared to" 70998084Sdougb echo " a umask of 022. This umask allows world read permission when" 71098084Sdougb echo " the file's default permissions have it." 71152400Sbillf echo '' 71298084Sdougb echo " No world permissions can sometimes cause problems. A umask of" 71398084Sdougb echo " 022 will restore the default behavior, but is not mandatory." 71498084Sdougb echo " /etc/master.passwd is a special case. Its file permissions" 71598084Sdougb echo " will be 600 (rw-------) if installed." 71697960Sdougb echo '' 71798084Sdougb echo -n "What umask should I use? [${USER_UMASK}] " 71898084Sdougb read NEW_UMASK 71998084Sdougb 72098084Sdougb NEW_UMASK="${NEW_UMASK:-$USER_UMASK}" 72152400Sbillf ;; 72252400Sbillf esac 72352400Sbillf echo '' 72498084Sdougbfi 72552400Sbillf 72698084SdougbCONFIRMED_UMASK=${NEW_UMASK:-0022} 72798084Sdougb 72852400Sbillf# 729114501Sdougb# Warn users who still have old rc files 730114501Sdougb# 731179315Sbzfor file in atm devfs diskless1 diskless2 network network6 pccard \ 732114523Sdougb serial syscons sysctl alpha amd64 i386 ia64 sparc64; do 733114501Sdougb if [ -f "${DESTDIR}/etc/rc.${file}" ]; then 734114501Sdougb OLD_RC_PRESENT=1 735114501Sdougb break 736114501Sdougb fi 737114501Sdougbdone 738114501Sdougb 739114501Sdougbcase "${OLD_RC_PRESENT}" in 740114501Sdougb1) 74152400Sbillf echo '' 742114501Sdougb echo " *** There are elements of the old rc system in ${DESTDIR}/etc/." 74367949Sdougb echo '' 744114501Sdougb echo ' While these scripts will not hurt anything, they are not' 745114501Sdougb echo ' functional on an up to date system, and can be removed.' 74667949Sdougb echo '' 747114501Sdougb 74852400Sbillf case "${AUTO_RUN}" in 74952400Sbillf '') 750114501Sdougb echo -n 'Move these files to /var/tmp/mergemaster/old_rc? [yes] ' 751114501Sdougb read MOVE_OLD_RC 75267859Sdougb 753114501Sdougb case "${MOVE_OLD_RC}" in 754114501Sdougb [nN]*) ;; 75552400Sbillf *) 756114501Sdougb mkdir -p /var/tmp/mergemaster/old_rc 757179315Sbz for file in atm devfs diskless1 diskless2 network network6 pccard \ 758114523Sdougb serial syscons sysctl alpha amd64 i386 ia64 sparc64; do 759114501Sdougb if [ -f "${DESTDIR}/etc/rc.${file}" ]; then 760114501Sdougb mv ${DESTDIR}/etc/rc.${file} /var/tmp/mergemaster/old_rc/ 761114501Sdougb fi 762114501Sdougb done 763114501Sdougb echo ' The files have been moved' 764114501Sdougb press_to_continue 76552400Sbillf ;; 76652400Sbillf esac 76752400Sbillf ;; 76852400Sbillf *) ;; 76952400Sbillf esac 770114501Sdougbesac 77152400Sbillf 77298084Sdougb# Use the umask/mode information to install the files 77352400Sbillf# Create directories as needed 77452400Sbillf# 775186678Sdougbinstall_error () { 776186678Sdougb echo "*** FATAL ERROR: Unable to install ${1} to ${2}" 777186678Sdougb echo '' 778186678Sdougb exit 1 779186678Sdougb} 780186678Sdougb 78178490Sdougbdo_install_and_rm () { 782114501Sdougb case "${PRESERVE_FILES}" in 783114501Sdougb [Yy][Ee][Ss]) 784114501Sdougb if [ -f "${3}/${2##*/}" ]; then 785114565Sdougb mkdir -p ${PRESERVE_FILES_DIR}/${2%/*} 786114565Sdougb cp ${3}/${2##*/} ${PRESERVE_FILES_DIR}/${2%/*} 787114501Sdougb fi 788114501Sdougb ;; 789114501Sdougb esac 790114501Sdougb 791186678Sdougb if [ ! -d "${3}/${2##*/}" ]; then 792186678Sdougb if install -m ${1} ${2} ${3}; then 793186678Sdougb unlink ${2} 794186678Sdougb else 795186678Sdougb install_error ${2} ${3} 796186678Sdougb fi 797186678Sdougb else 798186678Sdougb install_error ${2} ${3} 799186678Sdougb fi 80078490Sdougb} 80178490Sdougb 80298084Sdougb# 4095 = "obase=10;ibase=8;07777" | bc 80398084Sdougbfind_mode () { 80498084Sdougb local OCTAL 80598084Sdougb OCTAL=$(( ~$(echo "obase=10; ibase=8; ${CONFIRMED_UMASK}" | bc) & 4095 & 806124053Sdougb $(echo "obase=10; ibase=8; $(stat -f "%OMp%OLp" ${1})" | bc) )) 80798084Sdougb printf "%04o\n" ${OCTAL} 80898084Sdougb} 80998084Sdougb 81052400Sbillfmm_install () { 81152400Sbillf local INSTALL_DIR 81252400Sbillf INSTALL_DIR=${1#.} 81352400Sbillf INSTALL_DIR=${INSTALL_DIR%/*} 81467949Sdougb 81552400Sbillf case "${INSTALL_DIR}" in 81652400Sbillf '') 81752400Sbillf INSTALL_DIR=/ 81852400Sbillf ;; 81952400Sbillf esac 82052400Sbillf 82167949Sdougb if [ -n "${DESTDIR}${INSTALL_DIR}" -a ! -d "${DESTDIR}${INSTALL_DIR}" ]; then 82298084Sdougb DIR_MODE=`find_mode "${TEMPROOT}/${INSTALL_DIR}"` 823200425Sdougb install -d -o root -g wheel -m "${DIR_MODE}" "${DESTDIR}${INSTALL_DIR}" || 824200425Sdougb install_error $1 ${DESTDIR}${INSTALL_DIR} 82552400Sbillf fi 82652400Sbillf 82798084Sdougb FILE_MODE=`find_mode "${1}"` 82852400Sbillf 82952400Sbillf if [ ! -x "${1}" ]; then 83052400Sbillf case "${1#.}" in 83164625Sgshapiro /etc/mail/aliases) 83252400Sbillf NEED_NEWALIASES=yes 83352400Sbillf ;; 83452400Sbillf /etc/login.conf) 83552400Sbillf NEED_CAP_MKDB=yes 83652400Sbillf ;; 83752400Sbillf /etc/master.passwd) 83878490Sdougb do_install_and_rm 600 "${1}" "${DESTDIR}${INSTALL_DIR}" 83952400Sbillf NEED_PWD_MKDB=yes 84052400Sbillf DONT_INSTALL=yes 84152400Sbillf ;; 84252400Sbillf /.cshrc | /.profile) 843200708Sdougb local st_nlink 844200708Sdougb 845200708Sdougb # install will unlink the file before it installs the new one, 846200708Sdougb # so we have to restore/create the link afterwards. 847200708Sdougb # 848200708Sdougb st_nlink=0 # In case the file does not yet exist 849200708Sdougb eval $(stat -s ${DESTDIR}${COMPFILE#.} 2>/dev/null) 850200708Sdougb 851200708Sdougb do_install_and_rm "${FILE_MODE}" "${1}" "${DESTDIR}${INSTALL_DIR}" 852200708Sdougb 853200708Sdougb if [ -n "${AUTO_INSTALL}" -a $st_nlink -gt 1 ]; then 854200708Sdougb HANDLE_LINK=l 855200708Sdougb else 856200701Sdougb case "${LINK_EXPLAINED}" in 857200701Sdougb '') 858200701Sdougb echo " *** Historically BSD derived systems have had a" 859200701Sdougb echo " hard link from /.cshrc and /.profile to" 860200701Sdougb echo " their namesakes in /root. Please indicate" 861200701Sdougb echo " your preference below for bringing your" 862200701Sdougb echo " installed files up to date." 863200701Sdougb echo '' 864200701Sdougb LINK_EXPLAINED=yes 865200701Sdougb ;; 866200701Sdougb esac 867200701Sdougb 868200701Sdougb echo " Use 'd' to delete the temporary ${COMPFILE}" 869200708Sdougb echo " Use 'l' to delete the existing ${DESTDIR}/root/${COMPFILE##*/} and create the link" 87052400Sbillf echo '' 871200701Sdougb echo " Default is to leave the temporary file to deal with by hand" 872200701Sdougb echo '' 873200701Sdougb echo -n " How should I handle ${COMPFILE}? [Leave it to install later] " 874200701Sdougb read HANDLE_LINK 875200708Sdougb fi 87652400Sbillf 87752400Sbillf case "${HANDLE_LINK}" in 87852400Sbillf [dD]*) 87952400Sbillf rm "${COMPFILE}" 88052400Sbillf echo '' 88152400Sbillf echo " *** Deleting ${COMPFILE}" 88252400Sbillf ;; 88352400Sbillf [lL]*) 88452400Sbillf echo '' 885200708Sdougb unlink ${DESTDIR}/root/${COMPFILE##*/} 886200708Sdougb if ln ${DESTDIR}${COMPFILE#.} ${DESTDIR}/root/${COMPFILE##*/}; then 88767949Sdougb echo " *** Link from ${DESTDIR}${COMPFILE#.} to ${DESTDIR}/root/${COMPFILE##*/} installed successfully" 88852400Sbillf else 889200708Sdougb echo " *** Error linking ${DESTDIR}${COMPFILE#.} to ${DESTDIR}/root/${COMPFILE##*/}" 890200708Sdougb echo " *** ${COMPFILE} will remain for your consideration" 89152400Sbillf fi 89252400Sbillf ;; 89352400Sbillf *) 89452400Sbillf echo " *** ${COMPFILE} will remain for your consideration" 89552400Sbillf ;; 89652400Sbillf esac 897200708Sdougb return 89852400Sbillf ;; 89952400Sbillf esac 90052400Sbillf 90152400Sbillf case "${DONT_INSTALL}" in 90252400Sbillf '') 90378490Sdougb do_install_and_rm "${FILE_MODE}" "${1}" "${DESTDIR}${INSTALL_DIR}" 90452400Sbillf ;; 90552400Sbillf *) 90652400Sbillf unset DONT_INSTALL 90752400Sbillf ;; 90852400Sbillf esac 90978490Sdougb else # File matched -x 91078490Sdougb do_install_and_rm "${FILE_MODE}" "${1}" "${DESTDIR}${INSTALL_DIR}" 91152400Sbillf fi 91252400Sbillf return $? 91352400Sbillf} 91452400Sbillf 915174841Sdougbif [ ! -d "${TEMPROOT}" ]; then 916174841Sdougb echo "*** FATAL ERROR: The temproot directory (${TEMPROOT})" 917174841Sdougb echo ' has disappeared!' 918174841Sdougb echo '' 919174841Sdougb exit 1 920174841Sdougbfi 921174841Sdougb 92267949Sdougbecho '' 92367949Sdougbecho "*** Beginning comparison" 92467949Sdougbecho '' 92552400Sbillf 926124136Sdougb# Pre-world does not populate /etc/rc.d. 927124053Sdougb# It is very possible that a previous run would have deleted files in 928124053Sdougb# ${TEMPROOT}/etc/rc.d, thus creating a lot of false positives. 929124136Sdougbif [ -z "${PRE_WORLD}" -a -z "${RERUN}" ]; then 930124053Sdougb echo " *** Checking ${DESTDIR}/etc/rc.d for stale files" 931124053Sdougb echo '' 932124053Sdougb cd "${DESTDIR}/etc/rc.d" && 933124053Sdougb for file in *; do 934124053Sdougb if [ ! -e "${TEMPROOT}/etc/rc.d/${file}" ]; then 935124053Sdougb STALE_RC_FILES="${STALE_RC_FILES} ${file}" 936124053Sdougb fi 937124053Sdougb done 938124053Sdougb case "${STALE_RC_FILES}" in 939126718Sdougb ''|' *') 940124053Sdougb echo ' *** No stale files found' 941124053Sdougb ;; 942124053Sdougb *) 943124053Sdougb echo " *** The following files exist in ${DESTDIR}/etc/rc.d but not in" 944124053Sdougb echo " ${TEMPROOT}/etc/rc.d/:" 945124053Sdougb echo '' 946124053Sdougb echo "${STALE_RC_FILES}" 947124053Sdougb echo '' 948124053Sdougb echo ' The presence of stale files in this directory can cause the' 949124053Sdougb echo ' dreaded unpredictable results, and therefore it is highly' 950124053Sdougb echo ' recommended that you delete them.' 951124053Sdougb case "${AUTO_RUN}" in 952124053Sdougb '') 953124053Sdougb echo '' 954153604Sdougb echo -n ' *** Delete them now? [n] ' 955124053Sdougb read DELETE_STALE_RC_FILES 956124053Sdougb case "${DELETE_STALE_RC_FILES}" in 957153604Sdougb [yY]) 958124053Sdougb echo ' *** Deleting ... ' 959124053Sdougb rm ${STALE_RC_FILES} 960124053Sdougb echo ' done.' 961124053Sdougb ;; 962153604Sdougb *) 963153604Sdougb echo ' *** Files will not be deleted' 964153604Sdougb ;; 965124053Sdougb esac 966124053Sdougb sleep 2 967124053Sdougb ;; 968124053Sdougb esac 969124053Sdougb ;; 970124053Sdougb esac 971124053Sdougb echo '' 972124136Sdougbfi 973124053Sdougb 97467949Sdougbcd "${TEMPROOT}" 97567949Sdougb 97667949Sdougbif [ -r "${MM_PRE_COMPARE_SCRIPT}" ]; then 97767949Sdougb . "${MM_PRE_COMPARE_SCRIPT}" 97867949Sdougbfi 97967949Sdougb 980200425Sdougb# Things that were files/directories/links in one version can sometimes 981200425Sdougb# change to something else in a newer version. So we need to explicitly 982200425Sdougb# test for this, and warn the user if what we find does not match. 983200425Sdougb# 984200700Sdougbfor COMPFILE in `find . | sort` ; do 985200425Sdougb if [ -e "${DESTDIR}${COMPFILE#.}" ]; then 986200425Sdougb INSTALLED_TYPE=`stat -f '%HT' ${DESTDIR}${COMPFILE#.}` 987200425Sdougb else 988200425Sdougb continue 989200425Sdougb fi 990200425Sdougb TEMPROOT_TYPE=`stat -f '%HT' $COMPFILE` 991200425Sdougb 992200425Sdougb if [ ! "$TEMPROOT_TYPE" = "$INSTALLED_TYPE" ]; then 993200425Sdougb [ "$COMPFILE" = '.' ] && continue 994200425Sdougb TEMPROOT_TYPE=`echo $TEMPROOT_TYPE | tr [:upper:] [:lower:]` 995200425Sdougb INSTALLED_TYPE=`echo $INSTALLED_TYPE | tr [:upper:] [:lower:]` 996200425Sdougb 997200425Sdougb echo "*** The installed file ${DESTDIR}${COMPFILE#.} has the type \"$INSTALLED_TYPE\"" 998200425Sdougb echo " but the new version has the type \"$TEMPROOT_TYPE\"" 999200425Sdougb echo '' 1000200425Sdougb echo " How would you like to handle this?" 1001200425Sdougb echo '' 1002200425Sdougb echo " Use 'r' to remove ${DESTDIR}${COMPFILE#.}" 1003200425Sdougb case "$TEMPROOT_TYPE" in 1004200425Sdougb 'symbolic link') 1005200425Sdougb TARGET=`readlink $COMPFILE` 1006200425Sdougb echo " and create a link to $TARGET in its place" ;; 1007200425Sdougb *) echo " You will be able to install it as a \"$TEMPROOT_TYPE\"" ;; 1008200425Sdougb esac 1009200425Sdougb echo '' 1010200425Sdougb echo " Use 'i' to ignore this" 1011200425Sdougb echo '' 1012200425Sdougb echo -n " How to proceed? [i] " 1013200425Sdougb read ANSWER 1014200425Sdougb case "$ANSWER" in 1015200425Sdougb [rR]) case "${PRESERVE_FILES}" in 1016200425Sdougb [Yy][Ee][Ss]) 1017200425Sdougb mv ${DESTDIR}${COMPFILE#.} ${PRESERVE_FILES_DIR}/ || exit 1 ;; 1018200425Sdougb *) rm -rf ${DESTDIR}${COMPFILE#.} ;; 1019200425Sdougb esac 1020200425Sdougb case "$TEMPROOT_TYPE" in 1021200425Sdougb 'symbolic link') ln -sf $TARGET ${DESTDIR}${COMPFILE#.} ;; 1022200425Sdougb esac ;; 1023200425Sdougb *) echo '' 1024200425Sdougb echo "*** See the man page about adding ${COMPFILE#.} to the list of IGNORE_FILES" 1025200425Sdougb press_to_continue ;; 1026200425Sdougb esac 1027200425Sdougb echo '' 1028200425Sdougb fi 1029200425Sdougbdone 1030200425Sdougb 1031200700Sdougbfor COMPFILE in `find . -type f | sort`; do 103267949Sdougb 103367949Sdougb # First, check to see if the file exists in DESTDIR. If not, the 103467949Sdougb # diff_loop function knows how to handle it. 103567949Sdougb # 103667949Sdougb if [ ! -e "${DESTDIR}${COMPFILE#.}" ]; then 103777325Sdougb case "${AUTO_RUN}" in 103877325Sdougb '') 103977325Sdougb diff_loop 104077325Sdougb ;; 104177325Sdougb *) 104277325Sdougb case "${AUTO_INSTALL}" in 104377325Sdougb '') 104477325Sdougb # If this is an auto run, make it official 104577325Sdougb echo " *** ${COMPFILE} will remain for your consideration" 104677325Sdougb ;; 104777325Sdougb *) 104877325Sdougb diff_loop 104977325Sdougb ;; 105077325Sdougb esac 105177325Sdougb ;; 105277325Sdougb esac # Auto run test 105367949Sdougb continue 105467949Sdougb fi 105567949Sdougb 105652400Sbillf case "${STRICT}" in 105752400Sbillf '' | [Nn][Oo]) 105852400Sbillf # Compare CVS $Id's first so if the file hasn't been modified 105952400Sbillf # local changes will be ignored. 106052400Sbillf # If the files have the same $Id, delete the one in temproot so the 106152400Sbillf # user will have less to wade through if files are left to merge by hand. 106252400Sbillf # 106373651Sdougb CVSID1=`grep "[$]${CVS_ID_TAG}:" ${DESTDIR}${COMPFILE#.} 2>/dev/null` 106490564Sdougb CVSID2=`grep "[$]${CVS_ID_TAG}:" ${COMPFILE} 2>/dev/null` || CVSID2=none 106552400Sbillf 106667949Sdougb case "${CVSID2}" in 106773651Sdougb "${CVSID1}") 106867949Sdougb echo " *** Temp ${COMPFILE} and installed have the same CVS Id, deleting" 106967949Sdougb rm "${COMPFILE}" 107067949Sdougb ;; 107167949Sdougb esac 107252400Sbillf ;; 107352400Sbillf esac 107452400Sbillf 107552400Sbillf # If the file is still here either because the $Ids are different, the 107652400Sbillf # file doesn't have an $Id, or we're using STRICT mode; look at the diff. 107752400Sbillf # 107852400Sbillf if [ -f "${COMPFILE}" ]; then 107952400Sbillf 108052400Sbillf # Do an absolute diff first to see if the files are actually different. 108152400Sbillf # If they're not different, delete the one in temproot. 108252400Sbillf # 1083110377Sdougb if diff -q ${DIFF_OPTIONS} "${DESTDIR}${COMPFILE#.}" "${COMPFILE}" > \ 1084110377Sdougb /dev/null 2>&1; then 108552400Sbillf echo " *** Temp ${COMPFILE} and installed are the same, deleting" 108652400Sbillf rm "${COMPFILE}" 108752400Sbillf else 108877323Sdougb # Ok, the files are different, so show the user where they differ. 108977323Sdougb # Use user's choice of diff methods; and user's pager if they have one. 109077323Sdougb # Use more if not. 109167859Sdougb # Use unified diffs by default. Context diffs give me a headache. :) 109252400Sbillf # 1093189992Sdougb # If the user chose the -F option, test for that before proceeding 1094189992Sdougb # 1095189992Sdougb if [ -n "$FREEBSD_ID" ]; then 1096189992Sdougb if diff -q -I'[$]FreeBSD:.*$' "${DESTDIR}${COMPFILE#.}" "${COMPFILE}" > \ 1097189992Sdougb /dev/null 2>&1; then 1098189992Sdougb if mm_install "${COMPFILE}"; then 1099189992Sdougb echo "*** Updated revision control Id for ${DESTDIR}${COMPFILE#.}" 1100189992Sdougb else 1101189992Sdougb echo "*** Problem installing ${COMPFILE}, it will remain to merge by hand later" 1102189992Sdougb fi 1103189992Sdougb continue 1104189992Sdougb fi 1105189992Sdougb fi 110652400Sbillf case "${AUTO_RUN}" in 110752400Sbillf '') 110858910Salfred # prompt user to install/delete/merge changes 110958910Salfred diff_loop 111052400Sbillf ;; 111152400Sbillf *) 111252400Sbillf # If this is an auto run, make it official 111352400Sbillf echo " *** ${COMPFILE} will remain for your consideration" 111452400Sbillf ;; 111552400Sbillf esac # Auto run test 111652400Sbillf fi # Yes, the files are different 111752400Sbillf fi # Yes, the file still remains to be checked 1118189763Sdougbdone # This is for the for way up there at the beginning of the comparison 111952400Sbillf 112052534Sbillfecho '' 112152400Sbillfecho "*** Comparison complete" 1122158149Sgordon 1123192230Sdougbif [ -s "${MTREENEW}" ]; then 1124158149Sgordon echo "*** Saving mtree database for future upgrades" 1125200416Sdougb test -e "${MTREEFILE}" && unlink ${MTREEFILE} 1126200416Sdougb mv ${MTREENEW} ${MTREEFILE} 1127158149Sgordonfi 1128158149Sgordon 112952400Sbillfecho '' 113052400Sbillf 113152400SbillfTEST_FOR_FILES=`find ${TEMPROOT} -type f -size +0 2>/dev/null` 113252400Sbillfif [ -n "${TEST_FOR_FILES}" ]; then 113352400Sbillf echo "*** Files that remain for you to merge by hand:" 1134200700Sdougb find "${TEMPROOT}" -type f -size +0 | sort 113577335Sdougb echo '' 113652400Sbillffi 113752400Sbillf 113852400Sbillfcase "${AUTO_RUN}" in 113952400Sbillf'') 114067859Sdougb echo -n "Do you wish to delete what is left of ${TEMPROOT}? [no] " 114167859Sdougb read DEL_TEMPROOT 114267859Sdougb 114352400Sbillf case "${DEL_TEMPROOT}" in 114452400Sbillf [yY]*) 114599152Sdougb if delete_temproot; then 114652400Sbillf echo " *** ${TEMPROOT} has been deleted" 114752400Sbillf else 114852400Sbillf echo " *** Unable to delete ${TEMPROOT}" 114952400Sbillf fi 115052400Sbillf ;; 115152400Sbillf *) 115252400Sbillf echo " *** ${TEMPROOT} will remain" 115352400Sbillf ;; 115452400Sbillf esac 115552400Sbillf ;; 115652400Sbillf*) ;; 115752400Sbillfesac 115852400Sbillf 115968153Sdougbcase "${AUTO_INSTALLED_FILES}" in 116068153Sdougb'') ;; 116168153Sdougb*) 116273651Sdougb case "${AUTO_RUN}" in 116373651Sdougb '') 116473651Sdougb ( 116573651Sdougb echo '' 116677323Sdougb echo '*** You chose the automatic install option for files that did not' 116777323Sdougb echo ' exist on your system. The following were installed for you:' 116873651Sdougb echo "${AUTO_INSTALLED_FILES}" 116973651Sdougb ) | ${PAGER} 117073651Sdougb ;; 117173651Sdougb *) 117268153Sdougb echo '' 117377323Sdougb echo '*** You chose the automatic install option for files that did not' 117477323Sdougb echo ' exist on your system. The following were installed for you:' 117568153Sdougb echo "${AUTO_INSTALLED_FILES}" 117673651Sdougb ;; 117773651Sdougb esac 117868153Sdougb ;; 117968153Sdougbesac 118068153Sdougb 1181158149Sgordoncase "${AUTO_UPGRADED_FILES}" in 1182158149Sgordon'') ;; 1183158149Sgordon*) 1184158149Sgordon case "${AUTO_RUN}" in 1185158149Sgordon '') 1186158149Sgordon ( 1187158149Sgordon echo '' 1188158149Sgordon echo '*** You chose the automatic upgrade option for files that you did' 1189158149Sgordon echo ' not alter on your system. The following were upgraded for you:' 1190158149Sgordon echo "${AUTO_UPGRADED_FILES}" 1191158149Sgordon ) | ${PAGER} 1192158149Sgordon ;; 1193158149Sgordon *) 1194158149Sgordon echo '' 1195158149Sgordon echo '*** You chose the automatic upgrade option for files that you did' 1196158149Sgordon echo ' not alter on your system. The following were upgraded for you:' 1197158149Sgordon echo "${AUTO_UPGRADED_FILES}" 1198158149Sgordon ;; 1199158149Sgordon esac 1200158149Sgordon ;; 1201158149Sgordonesac 1202158149Sgordon 120373651Sdougbrun_it_now () { 120473651Sdougb case "${AUTO_RUN}" in 120573651Sdougb '') 120673651Sdougb unset YES_OR_NO 120773651Sdougb echo '' 120877335Sdougb echo -n ' Would you like to run it now? y or n [n] ' 120973651Sdougb read YES_OR_NO 121073651Sdougb 121173651Sdougb case "${YES_OR_NO}" in 121273651Sdougb y) 121377335Sdougb echo " Running ${1}" 121477335Sdougb echo '' 121573651Sdougb eval "${1}" 121673651Sdougb ;; 121777335Sdougb ''|n) 121877335Sdougb echo '' 121977335Sdougb echo " *** Cancelled" 122077335Sdougb echo '' 122177335Sdougb echo " Make sure to run ${1} yourself" 122277335Sdougb ;; 122373651Sdougb *) 122477335Sdougb echo '' 122577335Sdougb echo " *** Sorry, I do not understand your answer (${YES_OR_NO})" 122677335Sdougb echo '' 122777335Sdougb echo " Make sure to run ${1} yourself" 122873651Sdougb esac 122973651Sdougb ;; 123073651Sdougb *) ;; 123173651Sdougb esac 123273651Sdougb} 123373651Sdougb 123452400Sbillfcase "${NEED_NEWALIASES}" in 123552400Sbillf'') ;; 123652400Sbillf*) 123752400Sbillf echo '' 123877335Sdougb if [ -n "${DESTDIR}" ]; then 123977335Sdougb echo "*** You installed a new aliases file into ${DESTDIR}/etc/mail, but" 124077335Sdougb echo " the newaliases command is limited to the directories configured" 124177335Sdougb echo " in sendmail.cf. Make sure to create your aliases database by" 124277335Sdougb echo " hand when your sendmail configuration is done." 124377335Sdougb else 124477335Sdougb echo "*** You installed a new aliases file, so make sure that you run" 124577335Sdougb echo " '/usr/bin/newaliases' to rebuild your aliases database" 124677335Sdougb run_it_now '/usr/bin/newaliases' 124777335Sdougb fi 124852400Sbillf ;; 124952400Sbillfesac 125052400Sbillf 125152400Sbillfcase "${NEED_CAP_MKDB}" in 125252400Sbillf'') ;; 125352400Sbillf*) 125452400Sbillf echo '' 125552400Sbillf echo "*** You installed a login.conf file, so make sure that you run" 125677335Sdougb echo " '/usr/bin/cap_mkdb ${DESTDIR}/etc/login.conf'" 125777335Sdougb echo " to rebuild your login.conf database" 125877335Sdougb run_it_now "/usr/bin/cap_mkdb ${DESTDIR}/etc/login.conf" 125952400Sbillf ;; 126052400Sbillfesac 126152400Sbillf 126252400Sbillfcase "${NEED_PWD_MKDB}" in 126352400Sbillf'') ;; 126452400Sbillf*) 126552400Sbillf echo '' 126652400Sbillf echo "*** You installed a new master.passwd file, so make sure that you run" 126777335Sdougb if [ -n "${DESTDIR}" ]; then 126877335Sdougb echo " '/usr/sbin/pwd_mkdb -d ${DESTDIR}/etc -p ${DESTDIR}/etc/master.passwd'" 126977335Sdougb echo " to rebuild your password files" 127077335Sdougb run_it_now "/usr/sbin/pwd_mkdb -d ${DESTDIR}/etc -p ${DESTDIR}/etc/master.passwd" 127177335Sdougb else 127277335Sdougb echo " '/usr/sbin/pwd_mkdb -p /etc/master.passwd'" 127377335Sdougb echo " to rebuild your password files" 127477335Sdougb run_it_now '/usr/sbin/pwd_mkdb -p /etc/master.passwd' 127577335Sdougb fi 127652400Sbillf ;; 127752400Sbillfesac 127852400Sbillf 127952400Sbillfecho '' 128052400Sbillf 128167949Sdougbif [ -r "${MM_EXIT_SCRIPT}" ]; then 128267949Sdougb . "${MM_EXIT_SCRIPT}" 128367949Sdougbfi 128467949Sdougb 128591193Sdougbcase "${COMP_CONFS}" in 128691193Sdougb'') ;; 128791193Sdougb*) 128891193Sdougb . ${DESTDIR}/etc/defaults/rc.conf 128991193Sdougb 129091193Sdougb (echo '' 129191193Sdougb echo "*** Comparing conf files: ${rc_conf_files}" 129291193Sdougb 129391193Sdougb for CONF_FILE in ${rc_conf_files}; do 129491193Sdougb if [ -r "${DESTDIR}${CONF_FILE}" ]; then 129591193Sdougb echo '' 129691193Sdougb echo "*** From ${DESTDIR}${CONF_FILE}" 129791193Sdougb echo "*** From ${DESTDIR}/etc/defaults/rc.conf" 129891193Sdougb 129991193Sdougb for RC_CONF_VAR in `grep -i ^[a-z] ${DESTDIR}${CONF_FILE} | 130091193Sdougb cut -d '=' -f 1`; do 130191193Sdougb echo '' 130291223Sdougb grep -w ^${RC_CONF_VAR} ${DESTDIR}${CONF_FILE} 130391223Sdougb grep -w ^${RC_CONF_VAR} ${DESTDIR}/etc/defaults/rc.conf || 130491193Sdougb echo ' * No default variable with this name' 130591193Sdougb done 130691193Sdougb fi 130791193Sdougb done) | ${PAGER} 130891193Sdougb echo '' 130991193Sdougb ;; 131091193Sdougbesac 131191193Sdougb 131291193Sdougbcase "${PRE_WORLD}" in 131391193Sdougb'') ;; 131491193Sdougb*) 1315186678Sdougb MAKE_CONF="${SOURCEDIR}/share/examples/etc/make.conf" 131691193Sdougb 131791193Sdougb (echo '' 131891193Sdougb echo '*** Comparing make variables' 131991193Sdougb echo '' 132091193Sdougb echo "*** From ${DESTDIR}/etc/make.conf" 132191193Sdougb echo "*** From ${MAKE_CONF}" 132291193Sdougb 1323101348Sdougb for MAKE_VAR in `grep -i ^[a-z] ${DESTDIR}/etc/make.conf | cut -d '=' -f 1`; do 132491193Sdougb echo '' 132591223Sdougb grep -w ^${MAKE_VAR} ${DESTDIR}/etc/make.conf 132691223Sdougb grep -w ^#${MAKE_VAR} ${MAKE_CONF} || 132791193Sdougb echo ' * No example variable with this name' 132891193Sdougb done) | ${PAGER} 132991193Sdougb ;; 133091193Sdougbesac 133191193Sdougb 1332200425Sdougbif [ -n "${PRESERVE_FILES}" ]; then 1333200425Sdougb find -d $PRESERVE_FILES_DIR -type d -empty -delete 2>/dev/null 1334200425Sdougb rmdir $PRESERVE_FILES_DIR 2>/dev/null 1335200425Sdougbfi 1336200425Sdougb 133752400Sbillfexit 0 1338