summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaulo Fagundes <paulohefagundes@gmail.com>2019-11-09 10:23:21 -0700
committerAnish Athalye <me@anishathalye.com>2019-11-09 12:38:01 -0500
commitd2913e6cee1de35fda33317c9e34edcaac4b97f0 (patch)
tree913088bd57d57e4dbdb337ad27145855a1fd0c9b
parent5bb3c8a3437a55726a6bed191b008eff2afcda00 (diff)
Replace `which` with `command -v`
Some distributions such as Arch Linux no longer install `which` by default through the base package (see https://www.archlinux.org/news/base-group-replaced-by-mandatory-base-package-manual-intervention-required/). The maintainers have explained why `command -v` is superior: https://www.reddit.com/r/archlinux/comments/de1er6/arch_linux_news_base_group_replaced_by_mandatory/f2v8uhu/.
-rwxr-xr-xbin/dotbot6
-rw-r--r--test/tests/find-python-executable.bash2
2 files changed, 4 insertions, 4 deletions
diff --git a/bin/dotbot b/bin/dotbot
index a2ffe9a..6232a50 100755
--- a/bin/dotbot
+++ b/bin/dotbot
@@ -7,9 +7,9 @@
# is useful because we don't know the name of the python binary.
''':' # begin python string; this line is interpreted by the shell as `:`
-which python >/dev/null 2>&1 && exec python "$0" "$@"
-which python3 >/dev/null 2>&1 && exec python3 "$0" "$@"
-which python2 >/dev/null 2>&1 && exec python2 "$0" "$@"
+command -v python >/dev/null 2>&1 && exec python "$0" "$@"
+command -v python3 >/dev/null 2>&1 && exec python3 "$0" "$@"
+command -v python2 >/dev/null 2>&1 && exec python2 "$0" "$@"
>&2 echo "error: cannot find python"
exit 1
'''
diff --git a/test/tests/find-python-executable.bash b/test/tests/find-python-executable.bash
index d4fa7eb..9a91a74 100644
--- a/test/tests/find-python-executable.bash
+++ b/test/tests/find-python-executable.bash
@@ -31,7 +31,7 @@ touch ~/tmp_bin/python &&
chmod +x ~/tmp_bin/python &&
cat >> ~/tmp_bin/python <<EOF
#!$HOME/tmp_bin/bash
-exec $(which python)
+exec $(command -v python)
EOF
'