summaryrefslogtreecommitdiff
path: root/usr.sbin/sysmerge
AgeCommit message (Collapse)Author
2015-09-18In case of a hard error, remove all checksums except for examplessum whichAntoine Jacoutot
is special. Otherwise, we may miss comparing files at next run; we may miss some automation on the next run but it's safer this way.
2015-09-18Simplify: we don't need a work directory anymore, temproot is enough.Antoine Jacoutot
2015-09-18Tweak warning/error output a bit.Antoine Jacoutot
Check for examples changes at the end.
2015-09-18More dead code.Antoine Jacoutot
2015-09-09Remove more dead code.Antoine Jacoutot
2015-09-09Remove unused code.Antoine Jacoutot
2015-09-09Move and tweak a comment.Antoine Jacoutot
2015-09-07Simplify handling of sum files.Antoine Jacoutot
2015-09-07No need to restore backup of sum files; once the new ones are installed,Antoine Jacoutot
it means we already processed all relevant files.
2015-08-24cp -> mvAntoine Jacoutot
Put /usr/share/sysmerge under XXX.
2015-08-24Make backup directory of replaced files persistent: /var/sysmerge/backups.Antoine Jacoutot
3 rotations so that we have history of modified files. In batch mode, when a file cannot be handled automatically, remove it from the checksum file so that the next interactive sysmerge(8) run will ask to merge the changes. ok rpe@
2015-08-24/usr/share/sysmerge -> /var/sysmergeAntoine Jacoutot
requested by several discussed with deraadt@
2015-08-19Remove XXX.Antoine Jacoutot
2015-08-13Sync stripcom() with /etc/rc.Antoine Jacoutot
2015-07-27use file system path (.Pa) semantic markup macros where appropriate.Igor Sobrado
ok jmc@
2015-07-18Add groups before users.Antoine Jacoutot
2015-06-02fix variable name typoJoerg Jung
ok ajacoutot@
2015-03-12Set TERM if unset. Fixes some remote sysmerge usage by sthen@Antoine Jacoutot
ok sthen@
2015-02-17Instead of a relatively complex "stty size | ( read ..." in sysmerge, useStuart Henderson
"tput cols". (This from ajacoutot@). Use it directly in the sdiff command, rather than saving it once at startup. Handling window size changes at runtime makes sysmerge significantly easier to use in common cases. Adds around .17s per sdiff invocation on my slowest machine (486), imperceptible on a faster machine, so it seems a reasonable trade-off. ok ajacoutot@
2014-11-26Drop sysmerge.log ; it used to be handy for batch mode but now theAntoine Jacoutot
console output is clear and clean in that mode. Since /var/tmp is now a symlink to /tmp: - directly use /tmp - if modifications were done; at the end of the run: - display our backup directory (in case we want to move it to survive a reboot) - display where and what files are still left for comparison discussed with and ok sthen@
2014-10-09Tweak, no functional change.Antoine Jacoutot
2014-10-09Make sure _instdir is not null.Antoine Jacoutot
issue reported by jsg@
2014-09-16zap unnecessary quotesRobert Peichaer
OK ajacoutot@
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.
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-21 00:50:52 +0000