diff options
| -rw-r--r-- | usr.sbin/sysmerge/sysmerge.8 | 15 | ||||
| -rw-r--r-- | usr.sbin/sysmerge/sysmerge.sh | 8 |
2 files changed, 6 insertions, 17 deletions
diff --git a/usr.sbin/sysmerge/sysmerge.8 b/usr.sbin/sysmerge/sysmerge.8 index 03b740c597e..8e64b387f16 100644 --- a/usr.sbin/sysmerge/sysmerge.8 +++ b/usr.sbin/sysmerge/sysmerge.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: sysmerge.8,v 1.66 2014/09/05 17:19:48 ajacoutot Exp $ +.\" $OpenBSD: sysmerge.8,v 1.67 2014/09/05 17:26:08 ajacoutot Exp $ .\" .\" Copyright (c) 2008 Antoine Jacoutot <ajacoutot@openbsd.org> .\" @@ -50,7 +50,8 @@ run output log file. .Pp .Nm will work through the fileset, -offering the chance to merge any differences using ${SM_MERGE}. +offering the chance to merge any differences using +.Xr sdiff 1 . Merged files may be edited using the default editor or be left to deal with at a later date. Should any problems occur, @@ -148,16 +149,6 @@ the default is .Xr vi 1 . .It Ev PAGER Specifies the pagination program to use. -.It Ev SM_MERGE -Command used to merge diffs. -This will be called with three arguments: the first argument is the -output file to create, the second argument is the currently installed -file and the third argument is the reference file. -If unset, this defaults to -.Dq sdiff -as -w ${SWIDTH} -o -where -.Ev SWIDTH -is the size of the terminal. .It Ev TMPDIR Directory in which the work directory is created. If unset, this defaults to diff --git a/usr.sbin/sysmerge/sysmerge.sh b/usr.sbin/sysmerge/sysmerge.sh index a0e060c413b..f9f34e36f9a 100644 --- a/usr.sbin/sysmerge/sysmerge.sh +++ b/usr.sbin/sysmerge/sysmerge.sh @@ -1,6 +1,6 @@ #!/bin/ksh - # -# $OpenBSD: sysmerge.sh,v 1.171 2014/09/05 17:22:10 ajacoutot Exp $ +# $OpenBSD: sysmerge.sh,v 1.172 2014/09/05 17:26:08 ajacoutot Exp $ # # Copyright (c) 2008-2014 Antoine Jacoutot <ajacoutot@openbsd.org> # Copyright (c) 1998-2003 Douglas Barton <DougB@FreeBSD.org> @@ -370,12 +370,11 @@ sm_add_user_grp() { sm_merge_loop() { local INSTALL_MERGED MERGE_AGAIN - [[ ${SM_MERGE} == sdiff* ]] && \ - echo "===> Type h at the sdiff prompt (%) to get usage help\n" + echo "===> Type h at the sdiff prompt (%) to get usage help\n" MERGE_AGAIN=1 while [[ -n ${MERGE_AGAIN} ]]; do cp -p ${COMPFILE} ${COMPFILE}.merged - ${SM_MERGE} ${COMPFILE}.merged \ + sdiff -as -w ${_SWIDTH} -o ${COMPFILE}.merged \ ${TARGET} ${COMPFILE} INSTALL_MERGED=v while [[ ${INSTALL_MERGED} == "v" ]]; do @@ -636,7 +635,6 @@ _SWIDTH=$(stty size | awk '{w=$2} END {if (w==0) {w=80} print w}') _RELINT=$(uname -r | tr -d '.') readonly _WRKDIR _BKPDIR _TMPROOT _SWIDTH _RELINT -SM_MERGE=${SM_MERGE:=sdiff -as -w ${_SWIDTH} -o} [[ -z ${VISUAL} ]] && EDITOR=${EDITOR:=/usr/bin/vi} || EDITOR=${VISUAL} PAGER=${PAGER:=/usr/bin/more} |