summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>1997-12-13 20:06:15 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>1997-12-13 20:06:15 +0000
commitfca6528d115e02ac23ea1034158eef77cc8c7eb6 (patch)
treecc4ba68595dafb1af189ff3992ef412e211fab99 /usr.bin
parent9398ea032736a8d026776d91cc3b912c87c1ce2a (diff)
permit TMPDIR override; sef
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/locate/locate/concatdb.sh6
-rw-r--r--usr.bin/locate/locate/mklocatedb.sh6
-rw-r--r--usr.bin/locate/locate/updatedb.sh6
3 files changed, 9 insertions, 9 deletions
diff --git a/usr.bin/locate/locate/concatdb.sh b/usr.bin/locate/locate/concatdb.sh
index 2a18a2a9efa..537ee88e877 100644
--- a/usr.bin/locate/locate/concatdb.sh
+++ b/usr.bin/locate/locate/concatdb.sh
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $OpenBSD: concatdb.sh,v 1.5 1997/04/02 08:34:59 deraadt Exp $
+# $OpenBSD: concatdb.sh,v 1.6 1997/12/13 20:06:12 deraadt Exp $
#
# Copyright (c) September 1995 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
# All rights reserved.
@@ -32,7 +32,7 @@
#
# Sequence of databases is important.
#
-# $Id: concatdb.sh,v 1.5 1997/04/02 08:34:59 deraadt Exp $
+# $Id: concatdb.sh,v 1.6 1997/12/13 20:06:12 deraadt Exp $
# The directory containing locate subprograms
: ${LIBEXECDIR=/usr/libexec}; export LIBEXECDIR
@@ -41,7 +41,7 @@ PATH=$LIBEXECDIR:/bin:/usr/bin:$PATH; export PATH
umask 077 # protect temp files
-: ${TMPDIR=/tmp}; export TMPDIR;
+TMPDIR=${TMPDIR:-/tmp}; export TMPDIR;
if test X"$TMPDIR" = X -o ! -d "$TMPDIR"; then
TMPDIR=/tmp; export TMPDIR
fi
diff --git a/usr.bin/locate/locate/mklocatedb.sh b/usr.bin/locate/locate/mklocatedb.sh
index 2da091e7323..3a3231d2630 100644
--- a/usr.bin/locate/locate/mklocatedb.sh
+++ b/usr.bin/locate/locate/mklocatedb.sh
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $OpenBSD: mklocatedb.sh,v 1.5 1997/04/02 08:35:00 deraadt Exp $
+# $OpenBSD: mklocatedb.sh,v 1.6 1997/12/13 20:06:13 deraadt Exp $
#
# Copyright (c) September 1995 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
# All rights reserved.
@@ -30,7 +30,7 @@
#
# usage: mklocatedb [-presort] < filelist > database
#
-# $Id: mklocatedb.sh,v 1.5 1997/04/02 08:35:00 deraadt Exp $
+# $Id: mklocatedb.sh,v 1.6 1997/12/13 20:06:13 deraadt Exp $
# The directory containing locate subprograms
@@ -40,7 +40,7 @@ PATH=$LIBEXECDIR:/bin:/usr/bin:$PATH; export PATH
umask 077 # protect temp files
-: ${TMPDIR=/tmp}; export TMPDIR;
+TMPDIR=${TMPDIR:-/tmp}; export TMPDIR;
if test X"$TMPDIR" = X -o ! -d "$TMPDIR"; then
TMPDIR=/tmp; export TMPDIR
fi
diff --git a/usr.bin/locate/locate/updatedb.sh b/usr.bin/locate/locate/updatedb.sh
index 21f754aace8..03b05d55dc1 100644
--- a/usr.bin/locate/locate/updatedb.sh
+++ b/usr.bin/locate/locate/updatedb.sh
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $OpenBSD: updatedb.sh,v 1.9 1997/04/03 00:57:49 michaels Exp $
+# $OpenBSD: updatedb.sh,v 1.10 1997/12/13 20:06:14 deraadt Exp $
#
# Copyright (c) September 1995 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
# All rights reserved.
@@ -28,7 +28,7 @@
#
# updatedb - update locate database for local mounted filesystems
#
-# $Id: updatedb.sh,v 1.9 1997/04/03 00:57:49 michaels Exp $
+# $Id: updatedb.sh,v 1.10 1997/12/13 20:06:14 deraadt Exp $
LOCATE_CONFIG="/etc/locate.rc"
if [ -f "$LOCATE_CONFIG" -a -r "$LOCATE_CONFIG" ]; then
@@ -37,7 +37,7 @@ fi
# The directory containing locate subprograms
: ${LIBEXECDIR=/usr/libexec}; export LIBEXECDIR
-: ${TMPDIR=/tmp}; export TMPDIR
+TMPDIR=${TMPDIR:-/tmp}; export TMPDIR;
PATH=$LIBEXECDIR:/bin:/usr/bin:$PATH; export PATH