diff options
| author | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2019-09-28 17:30:08 +0000 |
|---|---|---|
| committer | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2019-09-28 17:30:08 +0000 |
| commit | c0c48cfcd9e6a3dc98e6322a0bcc0f2bdc615200 (patch) | |
| tree | a17c2532b17e44810d72887b795bd6474015984a | |
| parent | 7f85e105d9107f225988da3c1f31c59f619befac (diff) | |
Add where missing and harmonize PATH to be _PATH_DEFPATH (without local nor
X11R6).
Suggested by tb@
ok deraadt@ tb@ millert@
| -rw-r--r-- | libexec/reorder_kernel/reorder_kernel.sh | 4 | ||||
| -rw-r--r-- | usr.bin/cpp/cpp.sh | 4 | ||||
| -rw-r--r-- | usr.bin/diff3/diff3.ksh | 4 | ||||
| -rw-r--r-- | usr.sbin/adduser/rmgroup.sh | 4 | ||||
| -rw-r--r-- | usr.sbin/sysmerge/sysmerge.sh | 3 | ||||
| -rw-r--r-- | usr.sbin/syspatch/syspatch.sh | 3 | ||||
| -rw-r--r-- | usr.sbin/sysupgrade/sysupgrade.sh | 3 |
7 files changed, 14 insertions, 11 deletions
diff --git a/libexec/reorder_kernel/reorder_kernel.sh b/libexec/reorder_kernel/reorder_kernel.sh index 3c6f6f48487..200edbfe7d3 100644 --- a/libexec/reorder_kernel/reorder_kernel.sh +++ b/libexec/reorder_kernel/reorder_kernel.sh @@ -1,6 +1,6 @@ #!/bin/ksh # -# $OpenBSD: reorder_kernel.sh,v 1.8 2019/07/30 13:44:00 deraadt Exp $ +# $OpenBSD: reorder_kernel.sh,v 1.9 2019/09/28 17:30:07 ajacoutot Exp $ # # Copyright (c) 2017 Robert Peichaer <rpe@openbsd.org> # @@ -18,7 +18,7 @@ set -o errexit -export PATH=/bin:/sbin:/usr/bin:/usr/sbin +export PATH=/usr/bin:/bin:/usr/sbin:/sbin # Skip if /usr/share is on a nfs mounted filesystem. df -t nfs /usr/share >/dev/null 2>&1 && exit 1 diff --git a/usr.bin/cpp/cpp.sh b/usr.bin/cpp/cpp.sh index e842ad665fb..f88625fab9e 100644 --- a/usr.bin/cpp/cpp.sh +++ b/usr.bin/cpp/cpp.sh @@ -1,5 +1,5 @@ #!/bin/ksh -# $OpenBSD: cpp.sh,v 1.9 2013/12/09 02:35:09 guenther Exp $ +# $OpenBSD: cpp.sh,v 1.10 2019/09/28 17:30:07 ajacoutot Exp $ # # Copyright (c) 1990 The Regents of the University of California. @@ -39,7 +39,7 @@ # specifies -traditional # doesn't search gcc-include # -PATH=/usr/bin:/bin +PATH=/usr/bin:/bin:/usr/sbin:/sbin TRAD=-traditional DGNUC="@GNUC@" STDINC="-I/usr/include" diff --git a/usr.bin/diff3/diff3.ksh b/usr.bin/diff3/diff3.ksh index bf96b32d776..48bd8ae57bd 100644 --- a/usr.bin/diff3/diff3.ksh +++ b/usr.bin/diff3/diff3.ksh @@ -1,6 +1,6 @@ #!/bin/ksh - # -# $OpenBSD: diff3.ksh,v 1.5 2019/01/25 00:19:26 millert Exp $ +# $OpenBSD: diff3.ksh,v 1.6 2019/09/28 17:30:07 ajacoutot Exp $ # # Copyright (c) 2003 Todd C. Miller <millert@openbsd.org> # @@ -24,7 +24,7 @@ set -o posix # set POSIX mode to prevent +foo in getopts OPTIND=1 # force getopts to reset itself -export PATH=/bin:/usr/bin +export PATH=/usr/bin:/bin:/usr/sbin:/sbin diff3prog=/usr/libexec/diff3prog USAGE="usage: diff3 [-3aEeXx] file1 file2 file3" diff --git a/usr.sbin/adduser/rmgroup.sh b/usr.sbin/adduser/rmgroup.sh index d2da83b4f55..efb17a9d00f 100644 --- a/usr.sbin/adduser/rmgroup.sh +++ b/usr.sbin/adduser/rmgroup.sh @@ -1,5 +1,5 @@ #!/bin/sh -# $OpenBSD: rmgroup.sh,v 1.2 1998/07/16 16:47:41 millert Exp $ +# $OpenBSD: rmgroup.sh,v 1.3 2019/09/28 17:30:07 ajacoutot Exp $ # # Copyright (c) 1996 Wolfram Schneider <wosch@FreeBSD.org>. Berlin. # All rights reserved. @@ -8,7 +8,7 @@ # # $From: rmgroup.sh,v 1.1 1996/10/30 20:58:47 wosch Exp $ -PATH=/bin:/usr/bin; export PATH +export PATH=/usr/bin:/bin:/usr/sbin:/sbin db=/etc/group case "$1" in diff --git a/usr.sbin/sysmerge/sysmerge.sh b/usr.sbin/sysmerge/sysmerge.sh index d4e9934e8dc..79286eb9c5f 100644 --- a/usr.sbin/sysmerge/sysmerge.sh +++ b/usr.sbin/sysmerge/sysmerge.sh @@ -1,6 +1,6 @@ #!/bin/ksh - # -# $OpenBSD: sysmerge.sh,v 1.234 2019/09/08 13:30:46 ajacoutot Exp $ +# $OpenBSD: sysmerge.sh,v 1.235 2019/09/28 17:30:07 ajacoutot Exp $ # # Copyright (c) 2008-2014 Antoine Jacoutot <ajacoutot@openbsd.org> # Copyright (c) 1998-2003 Douglas Barton <DougB@FreeBSD.org> @@ -19,6 +19,7 @@ # umask 0022 +export PATH=/usr/bin:/bin:/usr/sbin:/sbin usage() { echo "usage: ${0##*/} [-bdp]" >&2 && exit 1 diff --git a/usr.sbin/syspatch/syspatch.sh b/usr.sbin/syspatch/syspatch.sh index e1719f5e2d4..4d3e6bf6748 100644 --- a/usr.sbin/syspatch/syspatch.sh +++ b/usr.sbin/syspatch/syspatch.sh @@ -1,6 +1,6 @@ #!/bin/ksh # -# $OpenBSD: syspatch.sh,v 1.149 2019/07/07 11:11:22 ajacoutot Exp $ +# $OpenBSD: syspatch.sh,v 1.150 2019/09/28 17:30:07 ajacoutot Exp $ # # Copyright (c) 2016, 2017 Antoine Jacoutot <ajacoutot@openbsd.org> # @@ -18,6 +18,7 @@ set -e umask 0022 +export PATH=/usr/bin:/bin:/usr/sbin:/sbin sp_err() { diff --git a/usr.sbin/sysupgrade/sysupgrade.sh b/usr.sbin/sysupgrade/sysupgrade.sh index b6c8a3fc48e..9bbdb095a18 100644 --- a/usr.sbin/sysupgrade/sysupgrade.sh +++ b/usr.sbin/sysupgrade/sysupgrade.sh @@ -1,6 +1,6 @@ #!/bin/ksh # -# $OpenBSD: sysupgrade.sh,v 1.24 2019/09/25 14:42:52 florian Exp $ +# $OpenBSD: sysupgrade.sh,v 1.25 2019/09/28 17:30:07 ajacoutot Exp $ # # Copyright (c) 1997-2015 Todd Miller, Theo de Raadt, Ken Westerback # Copyright (c) 2015 Robert Peichaer <rpe@openbsd.org> @@ -22,6 +22,7 @@ set -e umask 0022 +export PATH=/usr/bin:/bin:/usr/sbin:/sbin ARCH=$(uname -m) SETSDIR=/home/_sysupgrade |