summaryrefslogtreecommitdiff
path: root/usr.sbin/sysmerge
AgeCommit message (Expand)Author
2012-12-25replace one grep with awk patterns and simplify another using -qRobert Peichaer
2012-12-24simplify things by using shell patternsRobert Peichaer
2012-12-23simplify setting FETCH_CMD and move it upwards to where the otherRobert Peichaer
2012-12-19use (()) for arithmetic testsRobert Peichaer
2012-11-10consistently use [ -n "${var}" ] instead of [ "${var}" ]Robert Peichaer
2012-11-10turn single-command if-then-fi blocks into "[ expr ] && command"Robert Peichaer
2012-11-10enhance error_rm_wrkdir() to print an error message if one is passedRobert Peichaer
2012-11-08mark some more variables as localRobert Peichaer
2012-08-28Always compare master.passwd(5) and group(5) regardless of their sums:Antoine Jacoutot
2012-08-20Explicitely set local variables as such.Antoine Jacoutot
2012-08-20Don't unset NEED_NEWALIASES too soon or we will not get the warning.Antoine Jacoutot
2012-08-15use Lk for links;Jason McIntyre
2012-08-04Also log the file(s) we manually merged/installed as it's importantAntoine Jacoutot
2012-08-04Factorize common warn, error and report outputs into functions.Antoine Jacoutot
2012-03-19Use $() instead of backticks.Antoine Jacoutot
2012-02-17Remove the backup chunk from the man page. People should use backupAntoine Jacoutot
2011-10-09add a missing newline when you merge login.conf if login.conf.db doesn't existStuart Henderson
2011-09-01Fix the display of running utilities (e.g. don't say we are runningAntoine Jacoutot
2011-08-03Remove the 'obsolete file(s)' feature. It may come back at some pointAntoine Jacoutot
2011-07-21Adjust work directory name.Antoine Jacoutot
2011-07-11EDITOR or VISUAL are not a path. They are a string that needs to beTheo de Raadt
2011-07-11use more XXX for mktemp; ok ajacoutotTheo de Raadt
2011-07-06Harden the checks on the provided sets/src to make sure they are legit.Antoine Jacoutot
2011-07-06Consistency in stdout redirections.Antoine Jacoutot
2011-07-06Indent, no change.Antoine Jacoutot
2011-07-05Make it possible to pass https:// and file:// (along with ftp:// andAntoine Jacoutot
2011-05-09Installing -> Updating.Antoine Jacoutot
2011-05-08Make sure /etc/group and /etc/master.passwd are handled first in case weAntoine Jacoutot
2011-05-06If it doesn't exist, create the directory holding the link we are aboutAntoine Jacoutot
2011-04-27Cosmetic:Antoine Jacoutot
2011-04-21Oopsy.Antoine Jacoutot
2011-04-21Better detection of obsolete files (naddy@ reported a false positive).Antoine Jacoutot
2011-04-20Enhance sysmerge(8) output so that it is more readable and make it moreAntoine Jacoutot
2011-04-18Fix a bug where OBSOLETE_FILES would contain only the last appendedAntoine Jacoutot
2010-11-11Missed that part in previous.Antoine Jacoutot
2010-11-11Unconfuse usage.Antoine Jacoutot
2010-11-08No need to differentiate newly installed files versus automaticallyAntoine Jacoutot
2010-11-04Make sure we don't end up using /usr/src/etc if we forget to pass theAntoine Jacoutot
2010-08-21Display usage information as well as the error when a path toStuart Henderson
2010-07-20Instead of checking for the *etcXX.tgz filename, check whether theAntoine Jacoutot
2010-07-17When running in full diff mode, don't wait for user input beforeAntoine Jacoutot
2010-07-06Add a blank line between sections in the output log, it's more readable.Antoine Jacoutot
2010-07-05Automatically install missing users and groups.Antoine Jacoutot
2010-06-27Suggest a reboot if "sh MAKEDEV" was run or login.conf was modified.Antoine Jacoutot
2010-03-20s/sh/ksh/Antoine Jacoutot
2010-02-06Remove newly generated sum file(s) if it did not exist before and trapAntoine Jacoutot
2010-01-13- move the separator so it's just displayed for files with diffs toStuart Henderson
2009-12-18xargs takes the whole list as argument, so no need to append.Antoine Jacoutot
2009-12-18Add etcsum and xetcsum to IGNORE_FILES. Needed for upcoming change.Antoine Jacoutot
2009-12-06Add /var/db/locate.database and /var/games/tetris.scores to IGNORE_FILES.Antoine Jacoutot