diff options
| author | June McEnroe <june@causal.agency> | 2021-08-25 17:34:45 -0400 |
|---|---|---|
| committer | June McEnroe <june@causal.agency> | 2021-08-25 17:34:45 -0400 |
| commit | ad7bd9b40a9db1445413f30e1b6a63be8497dfa2 (patch) | |
| tree | 6d8c7c11deb942e2eb8d75550c970a3abe3215ba | |
| parent | Change liberapay link name to donate (diff) | |
| download | src-ad7bd9b40a9db1445413f30e1b6a63be8497dfa2.tar.gz src-ad7bd9b40a9db1445413f30e1b6a63be8497dfa2.zip | |
Use command -v rather than type
Some shells write to standard error from type when the command is not found. command -v is silent.
| -rw-r--r-- | bin/up.sh | 2 | ||||
| -rw-r--r-- | home/.profile | 8 | ||||
| -rw-r--r-- | home/.shrc | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/bin/up.sh b/bin/up.sh index 3da132c1..8febee95 100644 --- a/bin/up.sh +++ b/bin/up.sh @@ -39,7 +39,7 @@ uploadHilex() { uploadScreen() { temp - if type screencapture >/dev/null; then + if command -v screencapture >/dev/null; then screencapture -i "$@" "${temp}/capture.png" else scrot -s "$@" "${temp}/capture.png" 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 |