summaryrefslogtreecommitdiff
path: root/usr.sbin/sysmerge
AgeCommit message (Collapse)Author
2014-09-13In PKG mode, cope with non-default PREFIX (e.g. /var/www/...).Antoine Jacoutot
2014-09-09'rm -f' in case we skip a release. No functional change, just cosmetic.Antoine Jacoutot
2014-09-09Rreplace [[ -n $(grep..) ]] and [[ -z $(grep..) ]]Robert Peichaer
with grep -q and ! grep -q. OK ajacoutot@
2014-09-09Replace last usage of awk in sysmerge with a shell equivalent.Robert Peichaer
based on a diff from and OK ajacoutot@
2014-09-08Put chpass(1) args between quotes.Antoine Jacoutot
spotted by matthieu@
2014-09-08strip excess verbiage from sed expressionsAlexander Hall
ok and prodding ajacoutot@
2014-09-07Remove last use of xargs(1).Antoine Jacoutot
2014-09-07Only compare CVS Id when it's not empty.Antoine Jacoutot
2014-09-07Drop 2 uneeded xargs(1).Antoine Jacoutot
2014-09-07Consistency in var names.Antoine Jacoutot
2014-09-07Fix regression in detecting changed files.Antoine Jacoutot
2014-09-07Use shell substitution instead of dirname.Antoine Jacoutot
Fix installing pkg @sample when the target directory is missing. Fix output when a file fails to install.
2014-09-07Simplify checks.Antoine Jacoutot
2014-09-06Replace awk with either sed or shell equivalents.Robert Peichaer
OK ajacoutot@
2014-09-06Convert vars used as boolean (unset or 1) to true or false.Robert Peichaer
OK ajacoutot@
2014-09-06Remove backup checksums after a successfull run.Antoine Jacoutot
2014-09-06Files may have been removed in the previous step, so make sure they existAntoine Jacoutot
before trying to remove them again.
2014-09-05Drop support for SM_MERGE. The goal is to be a less interactive as possibleAntoine Jacoutot
so there is no point in allowing graphical merge tools to be used; especially since it is _completely_ untested...
2014-09-05Sync _ignorefiles.Antoine Jacoutot
2014-09-05Drop support for sendmail(8) -- hopefully it'll go away from base soon.Antoine Jacoutot
2014-09-05Spring cleanup in preparation for more changes.Antoine Jacoutot
Lots of moving around.
2014-09-05tweak previous;Jason McIntyre
2014-09-05Tweaks, no functionnal change.Antoine Jacoutot
2014-09-05/etc/{hosts,myname} are going away from etc.tgz.Antoine Jacoutot
2014-09-01Do not compare checksum of checksums...Antoine Jacoutot
2014-08-31Make sysmerge(8) completely silent by default when no file is modified.Antoine Jacoutot
2014-08-31In pkg mode, warn if the directory we want to copy the @sample file intoAntoine Jacoutot
does not exist and is not a @sample because we have no knowledge of the required owner/group/mode so we cannot create it.
2014-08-31Simplify examples files handling.Antoine Jacoutot
2014-08-31Only use the sum files corresponding to the mode we run in.Antoine Jacoutot
2014-08-31When we are not running in pkg mode, /usr/share/sysmerge/examplessumAntoine Jacoutot
should always be part of the temproot, so there's not need to check for its existence.
2014-08-31Do not overwrite examplessum; use the one we are provided with.Antoine Jacoutot
2014-08-30Refactor sum checks; all the information we need is already available soAntoine Jacoutot
not need to create sum files anymore (except in pkg mode).
2014-08-30sm_warn() always returns 0.Antoine Jacoutot
2014-08-30Indent.Antoine Jacoutot
2014-08-30DESTDIR is gone.Antoine Jacoutot
from Nathanael Rensen, thanks!
2014-08-29Some cleanings, no functional change.Antoine Jacoutot
2014-08-29knock out double .Pp;Jason McIntyre
2014-08-28Merge a paragraph.Antoine Jacoutot
2014-08-28tweak AUTHORS; ok ajacoutotJason McIntyre
2014-08-28Major sysmerge cleanup now that both etc and xetc sets are part of base.Antoine Jacoutot
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.
2014-08-27One less option.Antoine Jacoutot
2014-08-27Simplify examples handling.Antoine Jacoutot
2014-08-26Fist shot at fixing sysmerge(8) with etc-in-base; note that it's still inAntoine Jacoutot
transition state and the utility will get a lot of revamping in the near future.
2014-08-21Unbreak when "SRCDIR=."Antoine Jacoutot
reported by phessler@
2014-08-11Steal stripcom() from /etc/rc to parse sysmerge.ignore.Antoine Jacoutot
2014-08-11Move a sentence to the corresponding option description.Antoine Jacoutot
from jmc@
2014-08-10- add -p to SYNOPSISJason McIntyre
- the argument to -s is not optional ok ajacoutot
2014-08-09less chatty; ok ajacoutotJason McIntyre
2014-08-09Extend comment.Antoine Jacoutot
2014-08-09Initial support for handling configuration files from packagesAntoine Jacoutot
(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