diff options
| author | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2015-10-16 19:55:40 +0000 |
|---|---|---|
| committer | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2015-10-16 19:55:40 +0000 |
| commit | 64bbf0a80448caba91237f8a824f3a091157c326 (patch) | |
| tree | 9593bf1e6c62ff7e79f0b1bd7fa167783dcdb8d9 /usr.sbin/sysmerge/sysmerge.sh | |
| parent | 5482f8500b620c8b6214d61ddd5b4e3b296c67e4 (diff) | |
Drop usage of TMPDIR.
While here, stop refering to /tmp/sysmerge.XXXXXXXXXX, that's a script
internal we don't need to know about.
Diffstat (limited to 'usr.sbin/sysmerge/sysmerge.sh')
| -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 6e9bedd8b67..4498d746d16 100644 --- a/usr.sbin/sysmerge/sysmerge.sh +++ b/usr.sbin/sysmerge/sysmerge.sh @@ -1,6 +1,6 @@ #!/bin/ksh - # -# $OpenBSD: sysmerge.sh,v 1.214 2015/10/13 18:52:56 ajacoutot Exp $ +# $OpenBSD: sysmerge.sh,v 1.215 2015/10/16 19:55:39 ajacoutot Exp $ # # Copyright (c) 2008-2014 Antoine Jacoutot <ajacoutot@openbsd.org> # Copyright (c) 1998-2003 Douglas Barton <DougB@FreeBSD.org> @@ -613,7 +613,7 @@ shift $(( OPTIND -1 )) # global constants _BKPDIR=/var/sysmerge/backups _RELINT=$(uname -r | tr -d '.') || exit 1 -_TMPROOT=$(mktemp -d -p ${TMPDIR:=/tmp} sysmerge.XXXXXXXXXX) || exit 1 +_TMPROOT=$(mktemp -d -p /tmp sysmerge.XXXXXXXXXX) || exit 1 readonly _BKPDIR _RELINT _TMPROOT [[ -z ${VISUAL} ]] && EDITOR=${EDITOR:=/usr/bin/vi} || EDITOR=${VISUAL} |