From 08caa0a0b3da4d1dd33039ac59fb541497661671 Mon Sep 17 00:00:00 2001 From: June McEnroe 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. --- bin/up.sh | 2 +- home/.profile | 8 ++++---- 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 -- cgit 1.4.1 og/?id=b6c72806498e95cb08606a7ec46742e5439d3348&follow=1'>root/handle.c (unfollow)
Commit message (Expand)Author
2022-02-26Specify commands which depend on capsJune McEnroe
2022-02-26Only add available commands to completeJune McEnroe
2022-02-26Factor out commandAvailableJune McEnroe
2022-02-23Give examples of "general events" 2.1June McEnroe
2022-02-23Add missing unistd.h include in input.cJune McEnroe
2022-02-22Document the interfaceJune McEnroe
2022-02-20Clean up unimplemented editing mode stuffJune McEnroe
2022-02-20Save input buffer contentsJune McEnroe
2022-02-20Share a cut buffer between all edit buffersJune McEnroe
2022-02-20Assert return values in edit testsJune McEnroe
2022-02-20Move mbs out of struct Edit, use a global bufferJune McEnroe
2022-02-20Clear edit buffer before running commandJune McEnroe
2022-02-20Show indicator in status when window has pending inputJune McEnroe
2022-02-20Use separate edit buffers for each IDJune McEnroe
2022-02-20Make sure new cap is actually larger than new lengthJune McEnroe
2022-02-20Remove unused mbs.len field from struct EditJune McEnroe
2022-02-19Remove unneeded includes in ui.cJune McEnroe
2022-02-19Reimplement tab completeJune McEnroe
2022-02-19Handle errors from editFn, etc.June McEnroe
2022-02-19Reimplement text macrosJune McEnroe
2022-02-19Factor out input handling to input.cJune McEnroe
2022-02-19Factor out window management to window.cJune McEnroe
2022-02-19Enable -Wmissing-prototypesJune McEnroe
2022-02-19Fix edit.[ch] license notice additional permissionsJune McEnroe
2022-02-19Run line editing testsJune McEnroe
2022-02-18Implement new line editing "library"June McEnroe
2022-02-18Simplify cursor positioning in inputJune McEnroe
2022-02-18Fix M-f orderingJune McEnroe
2022-02-12Move sandman build to scripts/MakefileJune McEnroe
2022-02-12Use compat_readpassphrase.c on LinuxJune McEnroe
2022-02-12Copy RPP defines from oconfigureJune McEnroe