Move sysctl invocation to using a variable that's fully pathed.
This prevents errors for users that don't have /sbin in their PATH. Submitted by: Max Boyarov Approved by: mentor (wes@ implicit)
This commit is contained in:
parent
7984ab250b
commit
82db8a5e35
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=216426
@ -535,10 +535,10 @@ man_setup() {
|
|||||||
MACHINE=${mflag##*:}
|
MACHINE=${mflag##*:}
|
||||||
fi
|
fi
|
||||||
if [ -z "$MACHINE_ARCH" ]; then
|
if [ -z "$MACHINE_ARCH" ]; then
|
||||||
MACHINE_ARCH=$(sysctl -n hw.machine_arch)
|
MACHINE_ARCH=$($SYSCTL -n hw.machine_arch)
|
||||||
fi
|
fi
|
||||||
if [ -z "$MACHINE" ]; then
|
if [ -z "$MACHINE" ]; then
|
||||||
MACHINE=$(sysctl -n hw.machine)
|
MACHINE=$($SYSCTL -n hw.machine)
|
||||||
fi
|
fi
|
||||||
decho "Using architecture: $MACHINE_ARCH:$MACHINE"
|
decho "Using architecture: $MACHINE_ARCH:$MACHINE"
|
||||||
|
|
||||||
@ -895,6 +895,7 @@ EQN=/usr/bin/eqn
|
|||||||
COL=/usr/bin/col
|
COL=/usr/bin/col
|
||||||
NROFF='/usr/bin/groff -S -Wall -mtty-char -man'
|
NROFF='/usr/bin/groff -S -Wall -mtty-char -man'
|
||||||
PIC=/usr/bin/pic
|
PIC=/usr/bin/pic
|
||||||
|
SYSCTL=/sbin/sysctl
|
||||||
TBL=/usr/bin/tbl
|
TBL=/usr/bin/tbl
|
||||||
TROFF='/usr/bin/groff -S -man'
|
TROFF='/usr/bin/groff -S -man'
|
||||||
REFER=/usr/bin/refer
|
REFER=/usr/bin/refer
|
||||||
|
Loading…
Reference in New Issue
Block a user