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 /scripts | |
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 'scripts')
-rwxr-xr-x | scripts/build/bootstrap_debootstrap | 2 | ||||
-rwxr-xr-x | scripts/build/chroot_archives | 2 | ||||
-rwxr-xr-x | scripts/build/config | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/scripts/build/bootstrap_debootstrap b/scripts/build/bootstrap_debootstrap index d1fe54365..c25cbacec 100755 --- a/scripts/build/bootstrap_debootstrap +++ b/scripts/build/bootstrap_debootstrap @@ -21,7 +21,7 @@ USAGE="${PROGRAM} [--force]" # Processing arguments and configuration files Init_config_data "${@}" -if ! command -v debootstrap >/dev/null +if [ ! $(which debootstrap) ] then Echo_error "debootstrap - command not found" Echo_verbose "debootstrap can be obtained from http://ftp.debian.org/debian/pool/main/d/debootstrap/" diff --git a/scripts/build/chroot_archives b/scripts/build/chroot_archives index 612f8f74a..b602caf4b 100755 --- a/scripts/build/chroot_archives +++ b/scripts/build/chroot_archives @@ -238,7 +238,7 @@ case "${1}" in cp -f cache/indices.bootstrap/*Release* chroot/var/lib/apt/lists fi - if [ "${LB_APT}" = "aptitude" ] && ! command -v aptitude >/dev/null + if [ "${LB_APT}" = "aptitude" ] && [ ! $(which aptitude) ] then Chroot chroot "apt-get ${APT_OPTIONS} update" Chroot chroot "apt-get ${APT_OPTIONS} install aptitude" diff --git a/scripts/build/config b/scripts/build/config index 943ca7c00..0f84c28c7 100755 --- a/scripts/build/config +++ b/scripts/build/config @@ -182,7 +182,7 @@ Local_arguments () case "${1}" in --dump) # Dump version - if command -v dpkg-query >/dev/null + if [ $(which dpkg-query) ] then VERSION_DPKG="$(dpkg-query -f='${Version}' --show live-build)" fi |