remove type command
The posix equivalent of the type command is "command -v", so now we use that. Thanks to Jonathan Callen <jcallen@gentoo.org> for informing me wrt the fix.
This commit is contained in:
@@ -31,7 +31,7 @@ if service_present "$RC_DEFAULTLEVEL" consolefont ||
|
||||
service_present "$RC_BOOTLEVEL" consolefont; then
|
||||
printf "\033%s" "$termencoding" >"$CONSOLE" 2>/dev/null
|
||||
if [ -r "$RC_LIBEXECDIR"/console/font ] && \
|
||||
type setfont > /dev/null 2>&1; then
|
||||
command -v setfont > /dev/null 2>&1; then
|
||||
[ -c "$CONSOLE" ] && cons="-C $CONSOLE"
|
||||
setfont $cons "$RC_LIBEXECDIR"/console/font 2>/dev/null
|
||||
fi
|
||||
|
@@ -40,7 +40,7 @@ do_unmount()
|
||||
|
||||
retry=4 # Effectively TERM, sleep 1, TERM, sleep 1, KILL, sleep 1
|
||||
while ! LC_ALL=C $cmd "$mnt" 2>/dev/null; do
|
||||
if type fuser >/dev/null 2>&1; then
|
||||
if command -v fuser >/dev/null 2>&1; then
|
||||
pids="$(timeout -k 10 -s KILL "${rc_fuser_timeout:-60}" \
|
||||
fuser $f_opts "$mnt" 2>/dev/null)"
|
||||
fi
|
||||
|
Reference in New Issue
Block a user