diff options
| author |   ajacoutot <ajacoutot@openbsd.org> | 2015-03-12 12:46:01 +0000 |
|---|---|---|
| committer | ajacoutot <ajacoutot@openbsd.org> | 2015-03-12 12:46:01 +0000 |
| commit | e70724b938e4f409ddadea5a07596a934762a8f1 (patch) | |
| tree | cbec127dcf51a962d3fe21cca5c9195c58d096e5 | |
| parent | _PERFPOLICY can also be set to "high"; it's "auto" not "automatic"; and the variable (diff) | |
| download | wireguard-openbsd-e70724b938e4f409ddadea5a07596a934762a8f1.tar.xz wireguard-openbsd-e70724b938e4f409ddadea5a07596a934762a8f1.zip | |
Set TERM if unset. Fixes some remote sysmerge usage by sthen@
ok sthen@
| -rw-r--r-- | usr.sbin/sysmerge/sysmerge.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/sysmerge/sysmerge.sh b/usr.sbin/sysmerge/sysmerge.sh index 955d5c810cc..71f77f7fafe 100644 --- a/usr.sbin/sysmerge/sysmerge.sh +++ b/usr.sbin/sysmerge/sysmerge.sh @@ -1,6 +1,6 @@ #!/bin/ksh - # -# $OpenBSD: sysmerge.sh,v 1.194 2015/02/17 15:43:34 sthen Exp $ +# $OpenBSD: sysmerge.sh,v 1.195 2015/03/12 12:46:01 ajacoutot Exp $ # # Copyright (c) 2008-2014 Antoine Jacoutot <ajacoutot@openbsd.org> # Copyright (c) 1998-2003 Douglas Barton <DougB@FreeBSD.org> @@ -366,7 +366,7 @@ sm_merge_loop() { _tomerge=true while ${_tomerge}; do cp -p ${COMPFILE} ${COMPFILE}.merged - sdiff -as -w $(tput cols) -o ${COMPFILE}.merged \ + sdiff -as -w $(tput -T ${TERM:=vt100} cols) -o ${COMPFILE}.merged \ ${TARGET} ${COMPFILE} _instmerged=v while [[ ${_instmerged} == v ]]; do |