summaryrefslogtreecommitdiff
path: root/frontend/lb
diff options
context:
space:
mode:
authorLuca Boccassi <luca.boccassi@microsoft.com>2020-03-12 12:32:06 +0000
committerLuca Boccassi <luca.boccassi@microsoft.com>2020-03-12 12:32:26 +0000
commit015e6b65f3173e16d7ee4c3d9fa407d7ed1c9c45 (patch)
tree7542fe60f3e17e8c944371a3922683998429d6d4 /frontend/lb
parentc2e73627dba7e421db409a9c1854598edaef65f1 (diff)
downloadvyos-live-build-015e6b65f3173e16d7ee4c3d9fa407d7ed1c9c45.tar.gz
vyos-live-build-015e6b65f3173e16d7ee4c3d9fa407d7ed1c9c45.zip
Revert "Test for executables: replace 'which' with more robust 'command -v'"
This reverts commit 2d9ab1f7f82f9a98b97d1503c1e3f31c86061c15. Causes test failure due to bashism.
Diffstat (limited to 'frontend/lb')
-rwxr-xr-xfrontend/lb4
1 files changed, 2 insertions, 2 deletions
diff --git a/frontend/lb b/frontend/lb
index 993d3a27d..464b07dcc 100755
--- a/frontend/lb
+++ b/frontend/lb
@@ -21,7 +21,7 @@ USAGE="lb {clean|config|build}"
case "${1}" in
-h|--help)
- if command -v man >/dev/null
+ if [ $(which man) ]
then
man lb
exit 0
@@ -76,7 +76,7 @@ case "${1}" in
then
# User has live-build installed in the system
SCRIPT=/usr/lib/live/build/"${COMMAND}"
- elif command -v "${COMMAND}" >/dev/null
+ elif [ $(which "${COMMAND}") ]
then
# User has live-build commands in path
SCRIPT="${COMMAND}"