From ad7bd9b40a9db1445413f30e1b6a63be8497dfa2 Mon Sep 17 00:00:00 2001
From: "C. McEnroe" <june@causal.agency>
Date: Wed, 25 Aug 2021 17:34:45 -0400
Subject: Use command -v rather than type

Some shells write to standard error from type when the command is
not found. command -v is silent.
---
 home/.profile | 8 ++++----
 home/.shrc    | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'home')

diff --git a/home/.profile b/home/.profile
index f4e4169e..58bac742 100644
--- a/home/.profile
+++ b/home/.profile
@@ -1,5 +1,5 @@
 _PATH=$PATH PATH=
-path() { [ -d "$1" ] && PATH="${PATH}${PATH:+:}${1}"; }
+path() { test -d "$1" && PATH="${PATH}${PATH:+:}${1}"; }
 for prefix in '' /usr/local /opt/local /usr ~/.local; do
 	path "${prefix}/sbin"
 	path "${prefix}/bin"
@@ -9,7 +9,7 @@ path /usr/games
 export MANPATH=:~/.local/share/man
 
 export EDITOR=vi
-type nvi >/dev/null && EDITOR=nvi
+command -v nvi >/dev/null && EDITOR=nvi
 export EXINIT='set ai iclower sm sw=4 ts=4 para=BlBdPpIt sect=ShSs | map gg 1G'
 export PAGER=less
 export LESS=FRXix4
@@ -17,7 +17,7 @@ export CLICOLOR=1
 export MANSECT=2:3:1:8:6:5:7:4:9
 export NETHACKOPTIONS='pickup_types:$!?+/=, color, DECgraphics'
 
-[ -e /usr/share/mk/sys.mk ] || export CFLAGS=-O
-[ -d /usr/home ] && cd
+test -e /usr/share/mk/sys.mk || export CFLAGS=-O
+test -d /usr/home && cd
 
 export ENV=~/.shrc
diff --git a/home/.shrc b/home/.shrc
index 605f864e..fb474b98 100644
--- a/home/.shrc
+++ b/home/.shrc
@@ -16,7 +16,7 @@ alias gc='git commit' gca='gc --amend' gt='git tag'
 alias gp='git push' gu='git pull' gf='git fetch' gr='git rebase'
 alias rand='openssl rand -base64 33'
 alias private='eval "$(gpg -d ~/.private)"'
-type doas >/dev/null && alias sudo=doas
+command -v doas >/dev/null && alias sudo=doas
 
 cat() {
 	if [ $# -eq 1 ] && test -t 1; then
-- 
cgit 1.4.1