diff options
| author | Luca Boccassi <luca.boccassi@microsoft.com> | 2020-03-12 12:32:06 +0000 |
|---|---|---|
| committer | Luca Boccassi <luca.boccassi@microsoft.com> | 2020-03-12 12:32:26 +0000 |
| commit | 015e6b65f3173e16d7ee4c3d9fa407d7ed1c9c45 (patch) | |
| tree | 7542fe60f3e17e8c944371a3922683998429d6d4 /functions/defaults.sh | |
| parent | c2e73627dba7e421db409a9c1854598edaef65f1 (diff) | |
| download | vyos-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 'functions/defaults.sh')
| -rwxr-xr-x | functions/defaults.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh index 14dd5d269..695195d9d 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -14,7 +14,7 @@ New_configuration () ## Runtime # Image: Architecture - if command -v dpkg >/dev/null + if [ $(which dpkg) ] then CURRENT_IMAGE_ARCHITECTURE="$(dpkg --print-architecture)" else @@ -94,7 +94,7 @@ Set_config_defaults () LB_SYSTEM="${LB_SYSTEM:-live}" # Setting mode (currently: debian, progress-linux) - if command -v lsb_release >/dev/null + if [ $(which lsb_release) ] then _DISTRIBUTOR="$(lsb_release -is | tr "[A-Z]" "[a-z]")" @@ -802,7 +802,7 @@ Check_config_defaults () { case "${LB_BINARY_FILESYSTEM}" in ntfs) - if ! command -v ntfs-3g >/dev/null + if [ ! $(which ntfs-3g) ] then Echo_error "Using ntfs as the binary filesystem is currently only supported if ntfs-3g is installed on the host system." |