| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2015-08-24 | cp -> mv | Antoine Jacoutot | |
| Put /usr/share/sysmerge under XXX. | |||
| 2015-08-24 | Make 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/sysmerge | Antoine Jacoutot | |
| requested by several discussed with deraadt@ | |||
| 2015-08-19 | Remove XXX. | Antoine Jacoutot | |
| 2015-08-13 | Sync stripcom() with /etc/rc. | Antoine Jacoutot | |
| 2015-07-27 | use file system path (.Pa) semantic markup macros where appropriate. | Igor Sobrado | |
| ok jmc@ | |||
| 2015-07-18 | Add groups before users. | Antoine Jacoutot | |
| 2015-06-02 | fix variable name typo | Joerg Jung | |
| ok ajacoutot@ | |||
| 2015-03-12 | Set TERM if unset. Fixes some remote sysmerge usage by sthen@ | Antoine Jacoutot | |
| ok sthen@ | |||
| 2015-02-17 | Instead of a relatively complex "stty size | ( read ..." in sysmerge, use | Stuart 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-26 | Drop sysmerge.log ; it used to be handy for batch mode but now the | Antoine 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-09 | Tweak, no functional change. | Antoine Jacoutot | |
| 2014-10-09 | Make sure _instdir is not null. | Antoine Jacoutot | |
| issue reported by jsg@ | |||
| 2014-09-16 | zap unnecessary quotes | Robert Peichaer | |
| OK ajacoutot@ | |||
| 2014-09-13 | In 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-09 | Rreplace [[ -n $(grep..) ]] and [[ -z $(grep..) ]] | Robert Peichaer | |
| with grep -q and ! grep -q. OK ajacoutot@ | |||
| 2014-09-09 | Replace last usage of awk in sysmerge with a shell equivalent. | Robert Peichaer | |
| based on a diff from and OK ajacoutot@ | |||
| 2014-09-08 | Put chpass(1) args between quotes. | Antoine Jacoutot | |
| spotted by matthieu@ | |||
| 2014-09-08 | strip excess verbiage from sed expressions | Alexander Hall | |
| ok and prodding ajacoutot@ | |||
| 2014-09-07 | Remove last use of xargs(1). | Antoine Jacoutot | |
| 2014-09-07 | Only compare CVS Id when it's not empty. | Antoine Jacoutot | |
| 2014-09-07 | Drop 2 uneeded xargs(1). | Antoine Jacoutot | |
| 2014-09-07 | Consistency in var names. | Antoine Jacoutot | |
| 2014-09-07 | Fix regression in detecting changed files. | Antoine Jacoutot | |
| 2014-09-07 | Use 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-07 | Simplify checks. | Antoine Jacoutot | |
| 2014-09-06 | Replace awk with either sed or shell equivalents. | Robert Peichaer | |
| OK ajacoutot@ | |||
| 2014-09-06 | Convert vars used as boolean (unset or 1) to true or false. | Robert Peichaer | |
| OK ajacoutot@ | |||
| 2014-09-06 | Remove backup checksums after a successfull run. | Antoine Jacoutot | |
| 2014-09-06 | Files may have been removed in the previous step, so make sure they exist | Antoine Jacoutot | |
| before trying to remove them again. | |||
| 2014-09-05 | Drop support for SM_MERGE. The goal is to be a less interactive as possible | Antoine Jacoutot | |
| so there is no point in allowing graphical merge tools to be used; especially since it is _completely_ untested... | |||
| 2014-09-05 | Sync _ignorefiles. | Antoine Jacoutot | |
| 2014-09-05 | Drop support for sendmail(8) -- hopefully it'll go away from base soon. | Antoine Jacoutot | |
| 2014-09-05 | Spring cleanup in preparation for more changes. | Antoine Jacoutot | |
| Lots of moving around. | |||
| 2014-09-05 | tweak previous; | Jason McIntyre | |
| 2014-09-05 | Tweaks, no functionnal change. | Antoine Jacoutot | |
| 2014-09-05 | /etc/{hosts,myname} are going away from etc.tgz. | Antoine Jacoutot | |
| 2014-09-01 | Do not compare checksum of checksums... | Antoine Jacoutot | |
| 2014-08-31 | Make sysmerge(8) completely silent by default when no file is modified. | Antoine Jacoutot | |
| 2014-08-31 | In pkg mode, warn if the directory we want to copy the @sample file into | Antoine 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-31 | Simplify examples files handling. | Antoine Jacoutot | |
| 2014-08-31 | Only use the sum files corresponding to the mode we run in. | Antoine Jacoutot | |
| 2014-08-31 | When we are not running in pkg mode, /usr/share/sysmerge/examplessum | Antoine Jacoutot | |
| should always be part of the temproot, so there's not need to check for its existence. | |||
| 2014-08-31 | Do not overwrite examplessum; use the one we are provided with. | Antoine Jacoutot | |
| 2014-08-30 | Refactor sum checks; all the information we need is already available so | Antoine Jacoutot | |
| not need to create sum files anymore (except in pkg mode). | |||
| 2014-08-30 | sm_warn() always returns 0. | Antoine Jacoutot | |
| 2014-08-30 | Indent. | Antoine Jacoutot | |
| 2014-08-30 | DESTDIR is gone. | Antoine Jacoutot | |
| from Nathanael Rensen, thanks! | |||
| 2014-08-29 | Some cleanings, no functional change. | Antoine Jacoutot | |
 |
index : src | |
| OpenBSD base system |
| summaryrefslogtreecommitdiff |