summaryrefslogtreecommitdiffstats
path: root/usr.sbin/sysmerge (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* In PKG mode, cope with non-default PREFIX (e.g. /var/www/...).ajacoutot2014-09-131-2/+5
|
* 'rm -f' in case we skip a release. No functional change, just cosmetic.ajacoutot2014-09-091-2/+3
|
* Rreplace [[ -n $(grep..) ]] and [[ -z $(grep..) ]]rpe2014-09-091-5/+5
| | | | | | with grep -q and ! grep -q. OK ajacoutot@
* Replace last usage of awk in sysmerge with a shell equivalent.rpe2014-09-091-5/+5
| | | | based on a diff from and OK ajacoutot@
* Put chpass(1) args between quotes.ajacoutot2014-09-081-2/+2
| | | | spotted by matthieu@
* strip excess verbiage from sed expressionshalex2014-09-081-3/+3
| | | | ok and prodding ajacoutot@
* Remove last use of xargs(1).ajacoutot2014-09-071-4/+3
|
* Only compare CVS Id when it's not empty.ajacoutot2014-09-071-3/+4
|
* Drop 2 uneeded xargs(1).ajacoutot2014-09-071-3/+3
|
* Consistency in var names.ajacoutot2014-09-071-51/+51
|
* Fix regression in detecting changed files.ajacoutot2014-09-071-3/+4
|
* Use shell substitution instead of dirname.ajacoutot2014-09-071-15/+14
| | | | | Fix installing pkg @sample when the target directory is missing. Fix output when a file fails to install.
* Simplify checks.ajacoutot2014-09-071-15/+11
|
* Replace awk with either sed or shell equivalents.rpe2014-09-061-11/+6
| | | | OK ajacoutot@
* Convert vars used as boolean (unset or 1) to true or false.rpe2014-09-061-40/+45
| | | | OK ajacoutot@
* Remove backup checksums after a successfull run.ajacoutot2014-09-061-5/+2
|
* Files may have been removed in the previous step, so make sure they existajacoutot2014-09-061-2/+4
| | | | before trying to remove them again.
* Drop support for SM_MERGE. The goal is to be a less interactive as possibleajacoutot2014-09-052-17/+6
| | | | | so there is no point in allowing graphical merge tools to be used; especially since it is _completely_ untested...
* Sync _ignorefiles.ajacoutot2014-09-051-4/+8
|
* Drop support for sendmail(8) -- hopefully it'll go away from base soon.ajacoutot2014-09-052-29/+10
|
* Spring cleanup in preparation for more changes.ajacoutot2014-09-051-176/+143
| | | | Lots of moving around.
* tweak previous;jmc2014-09-051-2/+2
|
* Tweaks, no functionnal change.ajacoutot2014-09-051-6/+6
|
* /etc/{hosts,myname} are going away from etc.tgz.ajacoutot2014-09-052-27/+18
|
* Do not compare checksum of checksums...ajacoutot2014-09-011-5/+6
|
* Make sysmerge(8) completely silent by default when no file is modified.ajacoutot2014-08-311-6/+2
|
* In pkg mode, warn if the directory we want to copy the @sample file intoajacoutot2014-08-311-13/+10
| | | | | does not exist and is not a @sample because we have no knowledge of the required owner/group/mode so we cannot create it.
* Simplify examples files handling.ajacoutot2014-08-311-9/+6
|
* Only use the sum files corresponding to the mode we run in.ajacoutot2014-08-311-3/+3
|
* When we are not running in pkg mode, /usr/share/sysmerge/examplessumajacoutot2014-08-311-4/+3
| | | | | should always be part of the temproot, so there's not need to check for its existence.
* Do not overwrite examplessum; use the one we are provided with.ajacoutot2014-08-311-3/+2
|
* Refactor sum checks; all the information we need is already available soajacoutot2014-08-301-36/+29
| | | | not need to create sum files anymore (except in pkg mode).
* sm_warn() always returns 0.ajacoutot2014-08-301-2/+2
|
* Indent.ajacoutot2014-08-301-3/+3
|
* DESTDIR is gone.ajacoutot2014-08-301-2/+2
| | | | from Nathanael Rensen, thanks!
* Some cleanings, no functional change.ajacoutot2014-08-291-65/+53
|
* knock out double .Pp;jmc2014-08-291-3/+2
|
* Merge a paragraph.ajacoutot2014-08-281-9/+8
|
* tweak AUTHORS; ok ajacoutotjmc2014-08-281-3/+3
|
* Major sysmerge cleanup now that both etc and xetc sets are part of base.ajacoutot2014-08-282-541/+352
| | | | | | | | | | | | | Expect more changes/cleanup/... in the near future. -S (signature) option is gone since we are not fetching sets anymore -s and -x are gone as well for obvious reasons Left is: usage: sysmerge [-bdp] I would appreciate feedback, *lots* of things have changed and there may be side effects I missed. Consider sysmerge as WIP for the time being.
* One less option.ajacoutot2014-08-271-2/+2
|
* Simplify examples handling.ajacoutot2014-08-271-19/+25
|
* Fist shot at fixing sysmerge(8) with etc-in-base; note that it's still inajacoutot2014-08-262-119/+50
| | | | | transition state and the utility will get a lot of revamping in the near future.
* Unbreak when "SRCDIR=."ajacoutot2014-08-211-2/+2
| | | | reported by phessler@
* Steal stripcom() from /etc/rc to parse sysmerge.ignore.ajacoutot2014-08-112-11/+21
|
* Move a sentence to the corresponding option description.ajacoutot2014-08-111-9/+6
| | | | from jmc@
* - add -p to SYNOPSISjmc2014-08-102-7/+6
| | | | | | - the argument to -s is not optional ok ajacoutot
* less chatty; ok ajacoutotjmc2014-08-091-7/+5
|
* Extend comment.ajacoutot2014-08-091-2/+2
|
* Initial support for handling configuration files from packagesajacoutot2014-08-092-17/+144
| | | | | | | | | (aka @sample) -- `sysmerge -p` Worked done at g2k14. Committing early so we have plenty of time for testing. with help from espie@ thanks to landry@ for feedback on initial testing