summaryrefslogtreecommitdiffstats
path: root/usr.sbin/mergemaster/mergemaster.sh
Commit message (Collapse)AuthorAgeFilesLines
* Put back the deletion of TEMPROOT/etc/passwd.dougb2003-03-051-1/+1
| | | | Noticed by: maxim
* Better handle the recent (desirable) change to create login.conf.db atdougb2003-03-051-4/+4
| | | | install time, and make sure to catch any future .db files as well.
* * Update copyright year.dougb2003-02-051-5/+6
| | | | | | | | | | | | * Give back one line of ws when showing a diff. This was requested by several. * Un-quote DIFF_FLAG, and add DIFF_OPTIONS. This will allow the user to do more creative things in a mergemaster rc file. Un-quoting is necessary in order to handle things like CVS Id tags that look like shell variables. * Simplify terminal width determination. Suggestions related to ignoring the CVS Id's were taken from several, with dillon and gad providing particularly helpful feedback.
* Backout last commit by request.dillon2003-01-281-44/+11
|
* Commit simple mergemaster changes to make the UI more deterministicdillon2003-01-251-11/+44
| | | | | (far easier to use) by limiting the initial display to the size of the window.
* Don't use NO_MAKEDEV* option, its the default now.phk2002-10-221-1/+1
|
* Suppress spurious warning messages about rm -rf TEMPROOT failingdougb2002-08-051-3/+3
| | | | | before chflags, and exit non-zero if the old TEMPROOT dir can't be deleted for whatever reason.
* Fix a couple DESTDIR related problems. Credit for the "Only in" sectiondougb2002-08-051-2/+2
| | | | | | goes to James <James_Bond_79@yahoo.com>, and Cyrille Lefevre <cyrille.lefevre@laposte.net>. The make variables problem was found by jon.
* * Handle all flags, not just schgdougb2002-06-301-3/+8
| | | | * Make chflags -R more efficient by deleting everything we can first
* Add 'chflags -R noschg' to the deletion process for the TEMPROOTdougb2002-06-261-1/+2
| | | | | directory so that /var/empty, and any other such items that are added in the future can be deleted effectively.
* Go back to taking the user's umask into account. Thanks to Alfred fordougb2002-06-101-23/+31
| | | | | | | hatching the idea of using dc, and Giorgos (keramida) for incubating it. This also reverses most of the previous commit which took out or modified the text about umask stuff.
* * Use the new stat(1) to get mode information from the files wedougb2002-06-061-34/+33
| | | | | | | are installing. * Since this means that for now we can't accomodate non-standard umask's, warn the user accordingly. * Convert the "press enter to continue" prompt into a function.
* Actually accept the default argument to SCREEN_WIDTH.dougb2002-05-281-0/+3
| | | | Submitted by: brian
* * Add some niceties to make the -p option quieter, and better behaveddougb2002-05-041-5/+28
| | | | | * Take a simple idea about setting the screen width using stty (for sdiff's purposes) thoughtfully suggested by Joerg to an absurd conclusion.
* Solve the problem of spuriously comparing files that were createddougb2002-04-081-0/+3
| | | | in the ${TEMPROOT}/usr/obj directory by deleting them first.
* Improve grep'ing for variables in make.conf and rc.conf*.dougb2002-02-251-4/+4
| | | | Thanks to cjc for the idea.
* * Add a feature to do a "pre {build|install}world" check of (so far)dougb2002-02-241-26/+90
| | | | | | | | master.passwd, group, and make.conf * Add a feature to check variables in rc.conf[.local] to their counterparts in /etc/defaults/rc.conf after a run * Twiddle whitespace a little * Change some "[ -f file ] && rm file" to "rm -f file"
* * Update (c)dougb2002-02-121-2/+5
| | | | | | | | | * Fix a problem with files that have no CVS $Id's. Thanks to naddy for spotting this one. It wasn't a _huge_ problem since almost all the files we install (except motd) have one, but still, it's a bug. * Add a divider between diff outputs, which is helpful both for logs, and for giving a good visual clue for diffs that are smaller than $LINES. Another helpful suggestion from Gary W. Swearingen, swear@blarg.net.
* Hopefully squish the problem of mm creating sendmail files indougb2001-08-071-1/+3
| | | | | | | | the source tree once and for all. Pointed out by: A cast of thousands Reviewed by: asmodai
* Work around the problem in RELENG_4 where the file doesn't actuallydougb2001-06-201-7/+13
| | | | | | | | | | exist, and therefore mm_install is returning the "fail" value of the test instead of the "success" value for install. This change is a no-op on HEAD, but since the only harm on RELENG_4 ATM is a spurious warning it can follow the usual MFC practice. Submitted by: A cast of thousands :-/
* Add the last of the compatibility mods from openbsd. Neatly, thedougb2001-05-301-9/+14
| | | | | | | | | "install && rm" change fits in with the new FreeBSD default of copy instead of move for install. Changing the order of the deletion of the spurious password files doesn't affect FreeBSD functionality, but it's done in such a way as not to matter. Obtained from: Christian Weisgerber <naddy@mips.inka.de>
* Various fixes, including suggestions from some thoughtful folks, thanks.dougb2001-05-281-18/+47
| | | | | | | | | * Minor umask portability change (Christian Weisgerber <naddy@mips.inka.de>) * Clarify default value of the "run it now" option (bmah) * Make "run it now" $DESTDIR safe (bsd) * Handle installation of hard links for /.profile and /.cshrc properly when the auto-install option is selected * Fix some more whitespace issues
* Be more consistent with the terminology, referring to "temporary anddougb2001-05-281-2/+2
| | | | | | | installed" instead of "old and new". Inspired by the somewhat non-linear PR, which really didn't have a fix, per se. PR: conf/27235 Roelof Osinga <roelof@eboa.com>
* Fix a problem when user selects -a (auto run) but we encounter a filedougb2001-05-281-1/+16
| | | | | | | | | | missing on the system. Instead of passing it by, mm was prompting... bad mm, no cookie! Brought to my attention by the PR, but the fix needed to be tweaked to handle the auto-install option as well. PR: misc/25731 Gilbert Gong <ggong@cal.alumni.berkeley.edu>
* Whitespace only changes to try and fit a little better into 80 columns.dougb2001-05-281-15/+20
|
* Change NO_MAKEDEV to a finer granularity method:asmodai2001-03-291-1/+1
| | | | | | | | | | NO_MAKEDEV_INSTALL and NO_MAKEDEV_RUN. The former implying the latter. The names imply what they do. The last commit by DES based on a PR defeated the original idea behind NO_MAKEDEV, which was not to run MAKEDEV, but to do the installation of MAKEDEV. This should satisfy both parties on the MAKEDEV challenge. Reflect this in mergemaster, this might later on be decided to be set to NO_MAKEDEV_INSTALL, for now I kept to the old behaviour.
* * Add two requested features, source'ing of /etc/mergemaster.rc, anddougb2001-03-051-15/+58
| | | | | | | | | | | | | | asking the user to actually run the recommended commands related to installation of files such as aliases or login.conf. * Return to using grep for CVS $Id comparison. Using ident caused too many problems for people with local CVS/RCS tags in their stuff. Attempt to make portability a little easier to maintain in spite of this change by defining the name of the tag to search for. This is a slightly different change that solves the problem in the PR. PR: bin/24564 Submitted by: Tony Finch <dot@dotat.at>
* * Reduce diffs to RELENG_4 by specifying a full path to sysctldougb2000-11-091-3/+9
| | | | | | | | | | | | | | | * Adjust a little whitespace * Make the distrib-dirs/mtree on DESTDIR conditional on user actually specifying a DESTDIR. This seemed like a safe way to get the right directories and permissions in the installed tree since 'make installworld' does the same thing, but in practice too many people have custom hacks that we should leave unmolested. Still need to find a way to deal with 'install -d' and permissions on nonexistent directories in the middle of the path, but this is at least no worse that it was before. PR: bin/22661
* Reorder one of the new features based on experience. Since the numberdougb2000-11-011-12/+12
| | | | | | | of files auto-installed during an upgrade from a really old system can get quite long, and it's piped to the PAGER already, print that first, then print any of the 4 two-line messages that might apply.
* Add several new features, reorder some code, and continue with thedougb2000-10-301-91/+136
| | | | | | | | | | | | | | | | | | | | | | | | | process of making the script more cross platform friendly. * Add -i option to automatically install files that do not exist on the system already. * Add the ability to specify DESTDIR. * Allow the user to specify scripts to run right before the comparison starts, and when mm is done. This will allow the user to specify customized local behavior, and implement features such as automatically deleting files. * Document the above changes in the man page. * Switch to using 'ident' for the CVS Id comparison, which should help with portability, and makes it faster. * Reorder, and in one case fix some code by doing things in ways that make more sense. * Check to see if the file exists on the system before doing the comparisons. This saves CPU cycles, and streamlines the auto-install process. I used bits and pieces of suggestions and patches from various people, ultimately too numerous to name. Which is not to say that they were not both appreciated, and helpful in achieving the ultimate result.
* More changes that don't modify functionality.dougb2000-10-291-60/+76
| | | | | | | * More whitespace * Change read -p to echo -n/read to help support portability * Genericize an informational message regarding /.cshrc and /.profile for the same reason
* Whitespace only. Make the style of the contributed sections consistent withdougb2000-10-291-133/+134
| | | | the rest of the file. (Read, put it back the way I like it.)
* Make mergemaster ignore files in /dev if /dev is a devfs.ben2000-08-261-1/+6
| | | | Approved by: Doug Barton <Doug@gorean.org>
* Use new aliases path (/etc/mail/aliases)gshapiro2000-08-131-1/+1
| | | | Approved by: Doug Barton <DougB@gorean.org>
* Be more careful about selecting a PAGER.brian2000-08-091-7/+14
| | | | | | Improve the question asked when the PAGER is invalid. Submitted by: Doug Barton <DougB@gorean.org>
* Actually accept 'm' as a PAGER query response to mean 'more'.bsd2000-05-121-1/+1
|
* Make mergemaster only take single letters for options as well as loopalfred2000-04-021-114/+167
| | | | | | | | | | | | | | | | asking a question again if given an invalid input instead of assuming what the user wants. /etc is not the place to make assumptions when given invalid input. Reformat some of the more convoluted code into seperate functions instead of being inline using tabs instead of space indents. Allow the user to view merged files they created with sdiff. Allow the user to redisplay the diff between the installed file and the new file again. Time wasted waiting for review: 1 month 2 weeks
* Use the new (Hi rwatson!) NO_MAKEDEV when making our temproot.billf2000-02-121-1/+1
| | | | | Submitted by: Doug Barton <Doug@gorean.org> (maintainer) Approved by: you-know-who.
* Allow $PAGER to have arguments.billf2000-02-081-1/+1
| | | | | | Submitted by: brian Reviewed by: Doug Barton <Doug@gorean.org> Approved by: jkh
* Add IGNORE_MOTD to allow the sysadmin to ignore (likely) differences inbillf1999-10-261-0/+8
| | | | | | the FreeBSD default motd and the system motd Submitted by: author
* Use $FreeBSD$ (instead of the author's $Revision$) to report thebillf1999-10-261-3/+1
| | | | | | version number now that we have it. Reviewed by: author
* Add $FreeBSD$billf1999-10-251-0/+1
|
* Import mergemaster into the tree, a product of freebsdcon.billf1999-10-201-0/+678
Submitted by: Doug Barton <doug@gorean.org>
OpenPOWER on IntegriCloud