lourenco/mgmt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

misc: Use bash's command instead of which

Browse Source 
Bash has a built-in command, `command`, that will search the path and
return the full path to a command if it exists (or an exit code of 1 if
it does not), preventing the requirement of the `which` package.
This commit is contained in:
Joe Julian
2018-01-12 15:57:16 -08:00
committed by James Shubin
parent 077b6e540a
commit bee1aa00f1
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
misc/make-deps.sh
View File

@@ -9,13 +9,13 @@ if env | grep -q '^TRAVIS=true$'; then
travis=1 travis=1
fi fi
sudo_command=$(which sudo) sudo_command=$(command -v sudo)
YUM=`which yum 2>/dev/null` YUM=`command -v yum 2>/dev/null`
DNF=`which dnf 2>/dev/null` DNF=`command -v dnf 2>/dev/null`
APT=`which apt-get 2>/dev/null` APT=`command -v apt-get 2>/dev/null`
BREW=`which brew 2>/dev/null` BREW=`command -v brew 2>/dev/null`
PACMAN=`which pacman 2>/dev/null` PACMAN=`command -v pacman 2>/dev/null`
# if DNF is available use it # if DNF is available use it
if [ -x "$DNF" ]; then if [ -x "$DNF" ]; then
@@ -81,5 +81,5 @@ fi
go get golang.org/x/tools/cmd/stringer # for automatic stringer-ing go get golang.org/x/tools/cmd/stringer # for automatic stringer-ing
go get github.com/jteeuwen/go-bindata/go-bindata # for compiling in non golang files go get github.com/jteeuwen/go-bindata/go-bindata # for compiling in non golang files
go get github.com/golang/lint/golint # for `golint`-ing go get github.com/golang/lint/golint # for `golint`-ing
go get -u gopkg.in/alecthomas/gometalinter.v1 && mv "$(dirname $(which gometalinter.v1))/gometalinter.v1" "$(dirname $(which gometalinter.v1))/gometalinter" && gometalinter --install # bonus go get -u gopkg.in/alecthomas/gometalinter.v1 && mv "$(dirname $(command -v gometalinter.v1))/gometalinter.v1" "$(dirname $(command -v gometalinter.v1))/gometalinter" && gometalinter --install # bonus
cd "$XPWD" >/dev/null cd "$XPWD" >/dev/null

2
tag.sh
View File

@@ -46,5 +46,5 @@ git push origin $t
# Be informative. # Be informative.
GIT_PAGER=cat git diff --stat "$v" "$t" GIT_PAGER=cat git diff --stat "$v" "$t"
if which contrib.sh &>/dev/null; then contrib.sh "$v"; fi if command -v contrib.sh &>/dev/null; then contrib.sh "$v"; fi
echo -e "run 'git log $v..$t' to see what has changed since $v" echo -e "run 'git log $v..$t' to see what has changed since $v"

2
test/test-yamlfmt.sh
View File

@@ -17,7 +17,7 @@ set -o pipefail
ROOT=$(dirname "${BASH_SOURCE}")/.. ROOT=$(dirname "${BASH_SOURCE}")/..
RUBY=`which ruby 2>/dev/null` RUBY=`command -v ruby 2>/dev/null`
if [ -z $RUBY ]; then if [ -z $RUBY ]; then
fail_test "The 'ruby' utility can't be found." fail_test "The 'ruby' utility can't be found."
fi fi