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-2003 Douglas Barton 9# DougB@FreeBSD.org 10 11# $FreeBSD: src/usr.sbin/mergemaster/mergemaster.sh,v 1.6.2.17 2003/03/10 06:55:48 dougb Exp $ 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]' 20 echo "Options:" 21 echo " -s Strict comparison (diff every pair of files)" 22 echo " -c Use context diff instead of unified diff" 23 echo " -r Re-run on a previously cleaned directory (skip temproot creation)" 24 echo " -v Be more verbose about the process, include additional checks" 25 echo " -a Leave all files that differ to merge by hand" 26 echo " -h Display more complete help" 27 echo ' -i Automatically install files that do not exist in destination directory' 28 echo ' -p Pre-buildworld mode, only compares crucial files' 29 echo ' -C Compare local rc.conf variables to the defaults' 30 echo " -m /path/directory Specify location of source to do the make in" 31 echo " -t /path/directory Specify temp root directory" 32 echo " -d Add date and time to directory name (e.g., /var/tmp/temproot.`date +%m%d.%H.%M`)" 33 echo " -u N Specify a numeric umask" 34 echo " -w N Specify a screen width in columns to sdiff" 35 echo ' -D /path/directory Specify the destination directory to install files to' 36 echo '' 37} 38 39display_help () { 40 echo "* To specify a directory other than /var/tmp/temproot for the" 41 echo " temporary root environment, use -t /path/to/temp/root" 42 echo "* The -w option takes a number as an argument for the column width" 43 echo " of the screen. The default is 80." 44 echo '* The -a option causes mergemaster to run without prompting.' 45} 46 47# Loop allowing the user to use sdiff to merge files and display the merged 48# file. 49merge_loop () { 50 case "${VERBOSE}" in 51 '') ;; 52 *) 53 echo " *** Type h at the sdiff prompt (%) to get usage help" 54 ;; 55 esac 56 echo '' 57 MERGE_AGAIN=yes 58 while [ "${MERGE_AGAIN}" = "yes" ]; do 59 # Prime file.merged so we don't blat the owner/group id's 60 cp -p "${COMPFILE}" "${COMPFILE}.merged" 61 sdiff -o "${COMPFILE}.merged" --text --suppress-common-lines \ 62 --width=${SCREEN_WIDTH:-80} "${DESTDIR}${COMPFILE#.}" "${COMPFILE}" 63 INSTALL_MERGED=V 64 while [ "${INSTALL_MERGED}" = "v" -o "${INSTALL_MERGED}" = "V" ]; do 65 echo '' 66 echo " Use 'i' to install merged file" 67 echo " Use 'r' to re-do the merge" 68 echo " Use 'v' to view the merged file" 69 echo " Default is to leave the temporary file to deal with by hand" 70 echo '' 71 echo -n " *** How should I deal with the merged file? [Leave it for later] " 72 read INSTALL_MERGED 73 74 case "${INSTALL_MERGED}" in 75 [iI]) 76 mv "${COMPFILE}.merged" "${COMPFILE}" 77 echo '' 78 if mm_install "${COMPFILE}"; then 79 echo " *** Merged version of ${COMPFILE} installed successfully" 80 else 81 echo " *** Problem installing ${COMPFILE}, it will remain to merge by hand later" 82 fi 83 unset MERGE_AGAIN 84 ;; 85 [rR]) 86 rm "${COMPFILE}.merged" 87 ;; 88 [vV]) 89 ${PAGER} "${COMPFILE}.merged" 90 ;; 91 '') 92 echo " *** ${COMPFILE} will remain for your consideration" 93 unset MERGE_AGAIN 94 ;; 95 *) 96 echo "invalid choice: ${INSTALL_MERGED}" 97 INSTALL_MERGED=V 98 ;; 99 esac 100 done 101 done 102} 103 104# Loop showing user differences between files, allow merge, skip or install 105# options 106diff_loop () { 107 108 HANDLE_COMPFILE=v 109 110 while [ "${HANDLE_COMPFILE}" = "v" -o "${HANDLE_COMPFILE}" = "V" -o \ 111 "${HANDLE_COMPFILE}" = "NOT V" ]; do 112 if [ -f "${DESTDIR}${COMPFILE#.}" -a -f "${COMPFILE}" ]; then 113 if [ "${HANDLE_COMPFILE}" = "v" -o "${HANDLE_COMPFILE}" = "V" ]; then 114 echo '' 115 echo ' ====================================================================== ' 116 echo '' 117 ( 118 echo " *** Displaying differences between ${COMPFILE} and installed version:" 119 echo '' 120 diff ${DIFF_FLAG} ${DIFF_OPTIONS} "${DESTDIR}${COMPFILE#.}" "${COMPFILE}" 121 ) | ${PAGER} 122 echo '' 123 fi 124 else 125 echo '' 126 echo " *** There is no installed version of ${COMPFILE}" 127 echo '' 128 case "${AUTO_INSTALL}" in 129 [Yy][Ee][Ss]) 130 echo '' 131 if mm_install "${COMPFILE}"; then 132 echo " *** ${COMPFILE} installed successfully" 133 echo '' 134 # Make the list print one file per line 135 AUTO_INSTALLED_FILES="${AUTO_INSTALLED_FILES} ${DESTDIR}${COMPFILE#.} 136" 137 else 138 echo " *** Problem installing ${COMPFILE}, it will remain to merge by hand" 139 fi 140 return 141 ;; 142 *) 143 NO_INSTALLED=yes 144 ;; 145 esac 146 fi 147 148 echo " Use 'd' to delete the temporary ${COMPFILE}" 149 echo " Use 'i' to install the temporary ${COMPFILE}" 150 case "${NO_INSTALLED}" in 151 '') 152 echo " Use 'm' to merge the temporary and installed versions" 153 echo " Use 'v' to view the diff results again" 154 ;; 155 esac 156 echo '' 157 echo " Default is to leave the temporary file to deal with by hand" 158 echo '' 159 echo -n "How should I deal with this? [Leave it for later] " 160 read HANDLE_COMPFILE 161 162 case "${HANDLE_COMPFILE}" in 163 [dD]) 164 rm "${COMPFILE}" 165 echo '' 166 echo " *** Deleting ${COMPFILE}" 167 ;; 168 [iI]) 169 echo '' 170 if mm_install "${COMPFILE}"; then 171 echo " *** ${COMPFILE} installed successfully" 172 else 173 echo " *** Problem installing ${COMPFILE}, it will remain to merge by hand" 174 fi 175 ;; 176 [mM]) 177 case "${NO_INSTALLED}" in 178 '') 179 # interact with user to merge files 180 merge_loop 181 ;; 182 *) 183 echo '' 184 echo " *** There is no installed version of ${COMPFILE}" 185 echo '' 186 HANDLE_COMPFILE="NOT V" 187 ;; 188 esac # End of "No installed version of file but user selected merge" test 189 ;; 190 [vV]) 191 continue 192 ;; 193 '') 194 echo '' 195 echo " *** ${COMPFILE} will remain for your consideration" 196 ;; 197 *) 198 # invalid choice, show menu again. 199 echo "invalid choice: ${HANDLE_COMPFILE}" 200 echo '' 201 HANDLE_COMPFILE="NOT V" 202 continue 203 ;; 204 esac # End of "How to handle files that are different" 205 done 206 unset NO_INSTALLED 207 echo '' 208 case "${VERBOSE}" in 209 '') ;; 210 *) 211 sleep 3 212 ;; 213 esac 214} 215 216press_to_continue () { 217 local DISCARD 218 echo -n ' *** Press the [Enter] or [Return] key to continue ' 219 read DISCARD 220} 221 222# Set the default path for the temporary root environment 223# 224TEMPROOT='/var/tmp/temproot' 225 226# Read /etc/mergemaster.rc first so the one in $HOME can override 227# 228if [ -r /etc/mergemaster.rc ]; then 229 . /etc/mergemaster.rc 230fi 231 232# Read .mergemasterrc before command line so CLI can override 233# 234if [ -r "$HOME/.mergemasterrc" ]; then 235 . "$HOME/.mergemasterrc" 236fi 237 238# Check the command line options 239# 240while getopts ":ascrvhipCm:t:du:w:D:" COMMAND_LINE_ARGUMENT ; do 241 case "${COMMAND_LINE_ARGUMENT}" in 242 s) 243 STRICT=yes 244 unset DIFF_OPTIONS 245 ;; 246 c) 247 DIFF_FLAG='-c' 248 ;; 249 r) 250 RERUN=yes 251 ;; 252 v) 253 case "${AUTO_RUN}" in 254 '') VERBOSE=yes ;; 255 esac 256 ;; 257 a) 258 AUTO_RUN=yes 259 unset VERBOSE 260 ;; 261 h) 262 display_usage 263 display_help 264 exit 0 265 ;; 266 i) 267 AUTO_INSTALL=yes 268 ;; 269 C) 270 COMP_CONFS=yes 271 ;; 272 p) 273 PRE_WORLD=yes 274 unset COMP_CONFS 275 unset AUTO_RUN 276 ;; 277 m) 278 SOURCEDIR=${OPTARG} 279 ;; 280 t) 281 TEMPROOT=${OPTARG} 282 ;; 283 d) 284 TEMPROOT=${TEMPROOT}.`date +%m%d.%H.%M` 285 ;; 286 u) 287 NEW_UMASK=${OPTARG} 288 ;; 289 w) 290 SCREEN_WIDTH=${OPTARG} 291 ;; 292 D) 293 DESTDIR=${OPTARG} 294 ;; 295 *) 296 display_usage 297 exit 1 298 ;; 299 esac 300done 301 302echo '' 303 304# If the user has a pager defined, make sure we can run it 305# 306case "${DONT_CHECK_PAGER}" in 307'') 308 while ! type "${PAGER%% *}" >/dev/null && [ -n "${PAGER}" ]; do 309 echo " *** Your PAGER environment variable specifies '${PAGER}', but" 310 echo " due to the limited PATH that I use for security reasons," 311 echo " I cannot execute it. So, what would you like to do?" 312 echo '' 313 echo " Use 'e' to exit mergemaster and fix your PAGER variable" 314 if [ -x /usr/bin/less -o -x /usr/local/bin/less ]; then 315 echo " Use 'l' to set PAGER to 'less' for this run" 316 fi 317 echo " Use 'm' to use plain old 'more' as your PAGER for this run" 318 echo '' 319 echo " Default is to use plain old 'more' " 320 echo '' 321 echo -n "What should I do? [Use 'more'] " 322 read FIXPAGER 323 324 case "${FIXPAGER}" in 325 [eE]) 326 exit 0 327 ;; 328 [lL]) 329 if [ -x /usr/bin/less ]; then 330 PAGER=/usr/bin/less 331 elif [ -x /usr/local/bin/less ]; then 332 PAGER=/usr/local/bin/less 333 else 334 echo '' 335 echo " *** Fatal Error:" 336 echo " You asked to use 'less' as your pager, but I can't" 337 echo " find it in /usr/bin or /usr/local/bin" 338 exit 1 339 fi 340 ;; 341 [mM]|'') 342 PAGER=more 343 ;; 344 *) 345 echo '' 346 echo "invalid choice: ${FIXPAGER}" 347 esac 348 echo '' 349 done 350 ;; 351esac 352 353# If user has a pager defined, or got assigned one above, use it. 354# If not, use more. 355# 356PAGER=${PAGER:-more} 357 358if [ -n "${VERBOSE}" -a ! "${PAGER}" = "more" ]; then 359 echo " *** You have ${PAGER} defined as your pager so we will use that" 360 echo '' 361 sleep 3 362fi 363 364# Assign the diff flag once so we will not have to keep testing it 365# 366DIFF_FLAG=${DIFF_FLAG:--u} 367 368# Assign the source directory 369# 370SOURCEDIR=${SOURCEDIR:-/usr/src/etc} 371 372# Check the width of the user's terminal 373# 374if [ -t 0 ]; then 375 w=`tput columns` 376 case "${w}" in 377 0|'') ;; # No-op, since the input is not valid 378 *) 379 case "${SCREEN_WIDTH}" in 380 '') SCREEN_WIDTH="${w}" ;; 381 "${w}") ;; # No-op, since they are the same 382 *) 383 echo -n "*** You entered ${SCREEN_WIDTH} as your screen width, but stty " 384 echo "thinks it is ${w}." 385 echo '' 386 echo -n "What would you like to use? [${w}] " 387 read SCREEN_WIDTH 388 case "${SCREEN_WIDTH}" in 389 '') SCREEN_WIDTH="${w}" ;; 390 esac 391 ;; 392 esac 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}" 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 412 while [ "${TEST_TEMP_ROOT}" = "yes" ]; do 413 if [ -d "${TEMPROOT}" ]; then 414 echo "*** The directory specified for the temporary root environment," 415 echo " ${TEMPROOT}, exists. This can be a security risk if untrusted" 416 echo " users have access to the system." 417 echo '' 418 case "${AUTO_RUN}" in 419 '') 420 echo " Use 'd' to delete the old ${TEMPROOT} and continue" 421 echo " Use 't' to select a new temporary root directory" 422 echo " Use 'e' to exit mergemaster" 423 echo '' 424 echo " Default is to use ${TEMPROOT} as is" 425 echo '' 426 echo -n "How should I deal with this? [Use the existing ${TEMPROOT}] " 427 read DELORNOT 428 429 case "${DELORNOT}" in 430 [dD]) 431 echo '' 432 echo " *** Deleting the old ${TEMPROOT}" 433 echo '' 434 delete_temproot || exit 1 435 unset TEST_TEMP_ROOT 436 ;; 437 [tT]) 438 echo " *** Enter new directory name for temporary root environment" 439 read TEMPROOT 440 ;; 441 [eE]) 442 exit 0 443 ;; 444 '') 445 echo '' 446 echo " *** Leaving ${TEMPROOT} intact" 447 echo '' 448 unset TEST_TEMP_ROOT 449 ;; 450 *) 451 echo '' 452 echo "invalid choice: ${DELORNOT}" 453 echo '' 454 ;; 455 esac 456 ;; 457 *) 458 # If this is an auto-run, try a hopefully safe alternative then 459 # re-test anyway. 460 TEMPROOT=/var/tmp/temproot.`date +%m%d.%H.%M.%S` 461 ;; 462 esac 463 else 464 unset TEST_TEMP_ROOT 465 fi 466 done 467 468 echo "*** Creating the temporary root environment in ${TEMPROOT}" 469 470 if mkdir -p "${TEMPROOT}"; then 471 echo " *** ${TEMPROOT} ready for use" 472 fi 473 474 if [ ! -d "${TEMPROOT}" ]; then 475 echo '' 476 echo " *** FATAL ERROR: Cannot create ${TEMPROOT}" 477 echo '' 478 exit 1 479 fi 480 481 echo " *** Creating and populating directory structure in ${TEMPROOT}" 482 echo '' 483 484 case "${VERBOSE}" in 485 '') ;; 486 *) 487 press_to_continue 488 ;; 489 esac 490 491 case "${PRE_WORLD}" in 492 '') 493 { cd ${SOURCEDIR} && 494 case "${DESTDIR}" in 495 '') ;; 496 *) 497 make DESTDIR=${DESTDIR} distrib-dirs 498 ;; 499 esac 500 make DESTDIR=${TEMPROOT} distrib-dirs && 501 make MAKEOBJDIRPREFIX=${TEMPROOT}/usr/obj obj && 502 make MAKEOBJDIRPREFIX=${TEMPROOT}/usr/obj DESTDIR=${TEMPROOT} \ 503 -DNO_MAKEDEV_RUN distribution;} || 504 { echo ''; 505 echo " *** FATAL ERROR: Cannot 'cd' to ${SOURCEDIR} and install files to"; 506 echo " the temproot environment"; 507 echo ''; 508 exit 1;} 509 ;; 510 *) 511 # Only set up files that are crucial to {build|install}world 512 { mkdir -p ${TEMPROOT}/etc && 513 cp -p ${SOURCEDIR}/master.passwd ${TEMPROOT}/etc && 514 cp -p ${SOURCEDIR}/group ${TEMPROOT}/etc;} || 515 { echo ''; 516 echo ' *** FATAL ERROR: Cannot copy files to the temproot environment'; 517 echo ''; 518 exit 1;} 519 ;; 520 esac 521 522 # Doing the inventory and removing files that we don't want to compare only 523 # makes sense if we are not doing a rerun, since we have no way of knowing 524 # what happened to the files during previous incarnations. 525 case "${VERBOSE}" in 526 '') ;; 527 *) 528 echo '' 529 echo ' *** The following files exist only in the installed version of' 530 echo " ${DESTDIR}/etc. In the vast majority of cases these files" 531 echo ' are necessary parts of the system and should not be deleted.' 532 echo ' However because these files are not updated by this process you' 533 echo ' might want to verify their status before rebooting your system.' 534 echo '' 535 press_to_continue 536 diff -qr ${DESTDIR}/etc ${TEMPROOT}/etc | grep "^Only in ${DESTDIR}/etc" | ${PAGER} 537 echo '' 538 press_to_continue 539 ;; 540 esac 541 542 # Avoid comparing the motd if the user specifies it in .mergemasterrc 543 case "${IGNORE_MOTD}" in 544 '') ;; 545 *) rm -f ${TEMPROOT}/etc/motd 546 ;; 547 esac 548 549 ;; # End of the "RERUN" test 550esac 551 552# We really don't want to deal with derived files like login.conf.db, pwd.db, 553# passwd, or spwd.db. Instead, we want to compare the masters, and run *_mkdb. 554# Prompt the user to do so below, as needed. 555# 556rm -f ${TEMPROOT}/etc/*.db ${TEMPROOT}/etc/passwd 557 558# We only need to compare things like freebsd.cf once 559find ${TEMPROOT}/usr/obj -type f -delete 2>/dev/null 560 561# Get ready to start comparing files 562 563# Check umask if not specified on the command line, 564# and we are not doing an autorun 565# 566if [ -z "${NEW_UMASK}" -a -z "${AUTO_RUN}" ]; then 567 USER_UMASK=`umask` 568 case "${USER_UMASK}" in 569 0022|022) ;; 570 *) 571 echo '' 572 echo " *** Your umask is currently set to ${USER_UMASK}. By default, this script" 573 echo " installs all files with the same user, group and modes that" 574 echo " they are created with by ${SOURCEDIR}/Makefile, compared to" 575 echo " a umask of 022. This umask allows world read permission when" 576 echo " the file's default permissions have it." 577 echo '' 578 echo " No world permissions can sometimes cause problems. A umask of" 579 echo " 022 will restore the default behavior, but is not mandatory." 580 echo " /etc/master.passwd is a special case. Its file permissions" 581 echo " will be 600 (rw-------) if installed." 582 echo '' 583 echo -n "What umask should I use? [${USER_UMASK}] " 584 read NEW_UMASK 585 586 NEW_UMASK="${NEW_UMASK:-$USER_UMASK}" 587 ;; 588 esac 589 echo '' 590fi 591 592CONFIRMED_UMASK=${NEW_UMASK:-0022} 593 594# Warn users who still have ${DESTDIR}/etc/sysconfig 595# 596if [ -e "${DESTDIR}/etc/sysconfig" ]; then 597 echo '' 598 echo " *** There is a sysconfig file on this system in ${DESTDIR}/etc/." 599 echo '' 600 echo ' Starting with FreeBSD version 2.2.2 those settings moved from' 601 echo ' /etc/sysconfig to /etc/rc.conf. If you are upgrading an older' 602 echo ' system make sure that you transfer your settings by hand from' 603 echo ' sysconfig to rc.conf and install the rc.conf file. If you' 604 echo ' have already made this transition, you should consider' 605 echo ' renaming or deleting the sysconfig file.' 606 echo '' 607 case "${AUTO_RUN}" in 608 '') 609 echo -n "Continue with the merge process? [yes] " 610 read CONT_OR_NOT 611 612 case "${CONT_OR_NOT}" in 613 [nN]*) 614 exit 0 615 ;; 616 *) 617 echo " *** Continuing" 618 echo '' 619 ;; 620 esac 621 ;; 622 *) ;; 623 esac 624fi 625 626# Use the umask/mode information to install the files 627# Create directories as needed 628# 629do_install_and_rm () { 630 install -m "${1}" "${2}" "${3}" && 631 rm -f "${2}" 632} 633 634find_mode () { 635 local OCTAL 636 OCTAL=`perl -e 'printf "%04o\n", (((stat("$ARGV[0]"))[2] & 07777) &~ \ 637 oct("$ARGV[1]"))' "${1}" "${CONFIRMED_UMASK}"` 638 echo "${OCTAL}" 639} 640 641mm_install () { 642 local INSTALL_DIR 643 INSTALL_DIR=${1#.} 644 INSTALL_DIR=${INSTALL_DIR%/*} 645 646 case "${INSTALL_DIR}" in 647 '') 648 INSTALL_DIR=/ 649 ;; 650 esac 651 652 if [ -n "${DESTDIR}${INSTALL_DIR}" -a ! -d "${DESTDIR}${INSTALL_DIR}" ]; then 653 DIR_MODE=`find_mode "${TEMPROOT}/${INSTALL_DIR}"` 654 install -d -o root -g wheel -m "${DIR_MODE}" "${DESTDIR}${INSTALL_DIR}" 655 fi 656 657 FILE_MODE=`find_mode "${1}"` 658 659 if [ ! -x "${1}" ]; then 660 case "${1#.}" in 661 /etc/mail/aliases) 662 NEED_NEWALIASES=yes 663 ;; 664 /etc/login.conf) 665 NEED_CAP_MKDB=yes 666 ;; 667 /etc/master.passwd) 668 do_install_and_rm 600 "${1}" "${DESTDIR}${INSTALL_DIR}" 669 NEED_PWD_MKDB=yes 670 DONT_INSTALL=yes 671 ;; 672 /.cshrc | /.profile) 673 case "${AUTO_INSTALL}" in 674 '') 675 case "${LINK_EXPLAINED}" in 676 '') 677 echo " *** Historically BSD derived systems have had a" 678 echo " hard link from /.cshrc and /.profile to" 679 echo " their namesakes in /root. Please indicate" 680 echo " your preference below for bringing your" 681 echo " installed files up to date." 682 echo '' 683 LINK_EXPLAINED=yes 684 ;; 685 esac 686 687 echo " Use 'd' to delete the temporary ${COMPFILE}" 688 echo " Use 'l' to delete the existing ${DESTDIR}${COMPFILE#.} and create the link" 689 echo '' 690 echo " Default is to leave the temporary file to deal with by hand" 691 echo '' 692 echo -n " How should I handle ${COMPFILE}? [Leave it to install later] " 693 read HANDLE_LINK 694 ;; 695 *) # Part of AUTO_INSTALL 696 HANDLE_LINK=l 697 ;; 698 esac 699 700 case "${HANDLE_LINK}" in 701 [dD]*) 702 rm "${COMPFILE}" 703 echo '' 704 echo " *** Deleting ${COMPFILE}" 705 ;; 706 [lL]*) 707 echo '' 708 rm -f "${DESTDIR}${COMPFILE#.}" 709 if ln "${DESTDIR}/root/${COMPFILE##*/}" "${DESTDIR}${COMPFILE#.}"; then 710 echo " *** Link from ${DESTDIR}${COMPFILE#.} to ${DESTDIR}/root/${COMPFILE##*/} installed successfully" 711 rm "${COMPFILE}" 712 else 713 echo " *** Error linking ${DESTDIR}${COMPFILE#.} to ${DESTDIR}/root/${COMPFILE##*/}, ${COMPFILE} will remain to install by hand" 714 fi 715 ;; 716 *) 717 echo " *** ${COMPFILE} will remain for your consideration" 718 ;; 719 esac 720 DONT_INSTALL=yes 721 ;; 722 esac 723 724 case "${DONT_INSTALL}" in 725 '') 726 do_install_and_rm "${FILE_MODE}" "${1}" "${DESTDIR}${INSTALL_DIR}" 727 ;; 728 *) 729 unset DONT_INSTALL 730 ;; 731 esac 732 else # File matched -x 733 case "${1#.}" in 734 /dev/MAKEDEV) 735 NEED_MAKEDEV=yes 736 ;; 737 esac 738 do_install_and_rm "${FILE_MODE}" "${1}" "${DESTDIR}${INSTALL_DIR}" 739 fi 740 return $? 741} 742 743echo '' 744echo "*** Beginning comparison" 745echo '' 746 747cd "${TEMPROOT}" 748 749if [ -r "${MM_PRE_COMPARE_SCRIPT}" ]; then 750 . "${MM_PRE_COMPARE_SCRIPT}" 751fi 752 753# Using -size +0 avoids uselessly checking the empty log files created 754# by ${SOURCEDIR}/Makefile and the device entries in ./dev, but does 755# check the scripts in ./dev, as we'd like (assuming no devfs of course). 756# 757for COMPFILE in `find . -type f -size +0`; do 758 759 # First, check to see if the file exists in DESTDIR. If not, the 760 # diff_loop function knows how to handle it. 761 # 762 if [ ! -e "${DESTDIR}${COMPFILE#.}" ]; then 763 case "${AUTO_RUN}" in 764 '') 765 diff_loop 766 ;; 767 *) 768 case "${AUTO_INSTALL}" in 769 '') 770 # If this is an auto run, make it official 771 echo " *** ${COMPFILE} will remain for your consideration" 772 ;; 773 *) 774 diff_loop 775 ;; 776 esac 777 ;; 778 esac # Auto run test 779 continue 780 fi 781 782 case "${STRICT}" in 783 '' | [Nn][Oo]) 784 # Compare CVS $Id's first so if the file hasn't been modified 785 # local changes will be ignored. 786 # If the files have the same $Id, delete the one in temproot so the 787 # user will have less to wade through if files are left to merge by hand. 788 # 789 CVSID1=`grep "[$]${CVS_ID_TAG}:" ${DESTDIR}${COMPFILE#.} 2>/dev/null` 790 CVSID2=`grep "[$]${CVS_ID_TAG}:" ${COMPFILE} 2>/dev/null` || CVSID2=none 791 792 case "${CVSID2}" in 793 "${CVSID1}") 794 echo " *** Temp ${COMPFILE} and installed have the same CVS Id, deleting" 795 rm "${COMPFILE}" 796 ;; 797 esac 798 ;; 799 esac 800 801 # If the file is still here either because the $Ids are different, the 802 # file doesn't have an $Id, or we're using STRICT mode; look at the diff. 803 # 804 if [ -f "${COMPFILE}" ]; then 805 806 # Do an absolute diff first to see if the files are actually different. 807 # If they're not different, delete the one in temproot. 808 # 809 if diff -q ${DIFF_OPTIONS} "${DESTDIR}${COMPFILE#.}" "${COMPFILE}" > \ 810 /dev/null 2>&1; then 811 echo " *** Temp ${COMPFILE} and installed are the same, deleting" 812 rm "${COMPFILE}" 813 else 814 # Ok, the files are different, so show the user where they differ. 815 # Use user's choice of diff methods; and user's pager if they have one. 816 # Use more if not. 817 # Use unified diffs by default. Context diffs give me a headache. :) 818 # 819 case "${AUTO_RUN}" in 820 '') 821 # prompt user to install/delete/merge changes 822 diff_loop 823 ;; 824 *) 825 # If this is an auto run, make it official 826 echo " *** ${COMPFILE} will remain for your consideration" 827 ;; 828 esac # Auto run test 829 fi # Yes, the files are different 830 fi # Yes, the file still remains to be checked 831done # This is for the do way up there at the beginning of the comparison 832 833echo '' 834echo "*** Comparison complete" 835echo '' 836 837TEST_FOR_FILES=`find ${TEMPROOT} -type f -size +0 2>/dev/null` 838if [ -n "${TEST_FOR_FILES}" ]; then 839 echo "*** Files that remain for you to merge by hand:" 840 find "${TEMPROOT}" -type f -size +0 841 echo '' 842fi 843 844case "${AUTO_RUN}" in 845'') 846 echo -n "Do you wish to delete what is left of ${TEMPROOT}? [no] " 847 read DEL_TEMPROOT 848 849 case "${DEL_TEMPROOT}" in 850 [yY]*) 851 if delete_temproot; then 852 echo " *** ${TEMPROOT} has been deleted" 853 else 854 echo " *** Unable to delete ${TEMPROOT}" 855 fi 856 ;; 857 *) 858 echo " *** ${TEMPROOT} will remain" 859 ;; 860 esac 861 ;; 862*) ;; 863esac 864 865case "${AUTO_INSTALLED_FILES}" in 866'') ;; 867*) 868 case "${AUTO_RUN}" in 869 '') 870 ( 871 echo '' 872 echo '*** You chose the automatic install option for files that did not' 873 echo ' exist on your system. The following were installed for you:' 874 echo "${AUTO_INSTALLED_FILES}" 875 ) | ${PAGER} 876 ;; 877 *) 878 echo '' 879 echo '*** You chose the automatic install option for files that did not' 880 echo ' exist on your system. The following were installed for you:' 881 echo "${AUTO_INSTALLED_FILES}" 882 ;; 883 esac 884 ;; 885esac 886 887run_it_now () { 888 case "${AUTO_RUN}" in 889 '') 890 unset YES_OR_NO 891 echo '' 892 echo -n ' Would you like to run it now? y or n [n] ' 893 read YES_OR_NO 894 895 case "${YES_OR_NO}" in 896 y) 897 echo " Running ${1}" 898 echo '' 899 eval "${1}" 900 ;; 901 ''|n) 902 echo '' 903 echo " *** Cancelled" 904 echo '' 905 echo " Make sure to run ${1} yourself" 906 ;; 907 *) 908 echo '' 909 echo " *** Sorry, I do not understand your answer (${YES_OR_NO})" 910 echo '' 911 echo " Make sure to run ${1} yourself" 912 esac 913 ;; 914 *) ;; 915 esac 916} 917 918case "${NEED_MAKEDEV}" in 919'') ;; 920*) 921 echo '' 922 echo "*** You installed a new ${DESTDIR}/dev/MAKEDEV script, so make sure that you run" 923 echo " 'cd ${DESTDIR}/dev && /bin/sh MAKEDEV all' to rebuild your devices" 924 run_it_now "cd ${DESTDIR}/dev && /bin/sh MAKEDEV all" 925 ;; 926esac 927 928case "${NEED_NEWALIASES}" in 929'') ;; 930*) 931 echo '' 932 if [ -n "${DESTDIR}" ]; then 933 echo "*** You installed a new aliases file into ${DESTDIR}/etc/mail, but" 934 echo " the newaliases command is limited to the directories configured" 935 echo " in sendmail.cf. Make sure to create your aliases database by" 936 echo " hand when your sendmail configuration is done." 937 else 938 echo "*** You installed a new aliases file, so make sure that you run" 939 echo " '/usr/bin/newaliases' to rebuild your aliases database" 940 run_it_now '/usr/bin/newaliases' 941 fi 942 ;; 943esac 944 945case "${NEED_CAP_MKDB}" in 946'') ;; 947*) 948 echo '' 949 echo "*** You installed a login.conf file, so make sure that you run" 950 echo " '/usr/bin/cap_mkdb ${DESTDIR}/etc/login.conf'" 951 echo " to rebuild your login.conf database" 952 run_it_now "/usr/bin/cap_mkdb ${DESTDIR}/etc/login.conf" 953 ;; 954esac 955 956case "${NEED_PWD_MKDB}" in 957'') ;; 958*) 959 echo '' 960 echo "*** You installed a new master.passwd file, so make sure that you run" 961 if [ -n "${DESTDIR}" ]; then 962 echo " '/usr/sbin/pwd_mkdb -d ${DESTDIR}/etc -p ${DESTDIR}/etc/master.passwd'" 963 echo " to rebuild your password files" 964 run_it_now "/usr/sbin/pwd_mkdb -d ${DESTDIR}/etc -p ${DESTDIR}/etc/master.passwd" 965 else 966 echo " '/usr/sbin/pwd_mkdb -p /etc/master.passwd'" 967 echo " to rebuild your password files" 968 run_it_now '/usr/sbin/pwd_mkdb -p /etc/master.passwd' 969 fi 970 ;; 971esac 972 973echo '' 974 975if [ -r "${MM_EXIT_SCRIPT}" ]; then 976 . "${MM_EXIT_SCRIPT}" 977fi 978 979case "${COMP_CONFS}" in 980'') ;; 981*) 982 . ${DESTDIR}/etc/defaults/rc.conf 983 984 (echo '' 985 echo "*** Comparing conf files: ${rc_conf_files}" 986 987 for CONF_FILE in ${rc_conf_files}; do 988 if [ -r "${DESTDIR}${CONF_FILE}" ]; then 989 echo '' 990 echo "*** From ${DESTDIR}${CONF_FILE}" 991 echo "*** From ${DESTDIR}/etc/defaults/rc.conf" 992 993 for RC_CONF_VAR in `grep -i ^[a-z] ${DESTDIR}${CONF_FILE} | 994 cut -d '=' -f 1`; do 995 echo '' 996 grep -w ^${RC_CONF_VAR} ${DESTDIR}${CONF_FILE} 997 grep -w ^${RC_CONF_VAR} ${DESTDIR}/etc/defaults/rc.conf || 998 echo ' * No default variable with this name' 999 done 1000 fi 1001 done) | ${PAGER} 1002 echo '' 1003 ;; 1004esac 1005 1006case "${PRE_WORLD}" in 1007'') ;; 1008*) 1009 MAKE_CONF="${SOURCEDIR}/defaults/make.conf" 1010 1011 (echo '' 1012 echo '*** Comparing make variables' 1013 echo '' 1014 echo "*** From ${DESTDIR}/etc/make.conf" 1015 echo "*** From ${MAKE_CONF}" 1016 1017 for MAKE_VAR in `grep -i ^[a-z] ${DESTDIR}/etc/make.conf | cut -d '=' -f 1`; do 1018 echo '' 1019 grep -w ^${MAKE_VAR} ${DESTDIR}/etc/make.conf 1020 grep -w ^#${MAKE_VAR} ${MAKE_CONF} || 1021 echo ' * No example variable with this name' 1022 done) | ${PAGER} 1023 ;; 1024esac 1025 1026exit 0 1027 1028