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/build/chroot_archives | |
| 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/build/chroot_archives')
| -rwxr-xr-x | scripts/build/chroot_archives | 2 |
1 files changed, 1 insertions, 1 deletions
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" |