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 /share | |
| 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 'share')
4 files changed, 4 insertions, 4 deletions
diff --git a/share/bin/Packages b/share/bin/Packages index 60cd999fc..ad69fad83 100755 --- a/share/bin/Packages +++ b/share/bin/Packages @@ -11,7 +11,7 @@ set -e -if ! command -v grep-aptavail >/dev/null +if [ ! $(which grep-aptavail) ] then echo "E: program grep-aptavail not found!" diff --git a/share/hooks/normal/0400-update-apt-file-cache.hook.chroot b/share/hooks/normal/0400-update-apt-file-cache.hook.chroot index c83225fe5..4634d4cf8 100755 --- a/share/hooks/normal/0400-update-apt-file-cache.hook.chroot +++ b/share/hooks/normal/0400-update-apt-file-cache.hook.chroot @@ -8,7 +8,7 @@ set -e . /live-build/config/binary -if command -v apt-file >/dev/null && [ "${LB_APT_INDICES}" = "true" ] +if [ $(which apt-file) ] && [ "${LB_APT_INDICES}" = "true" ] then apt-file update fi diff --git a/share/hooks/normal/0410-update-apt-xapian-index.hook.chroot b/share/hooks/normal/0410-update-apt-xapian-index.hook.chroot index f737ad171..93801e511 100755 --- a/share/hooks/normal/0410-update-apt-xapian-index.hook.chroot +++ b/share/hooks/normal/0410-update-apt-xapian-index.hook.chroot @@ -8,7 +8,7 @@ set -e # is not allowed to, and (b) it wants to build the index in the background which # will be racy in the context of live-build. -if command -v update-apt-xapian-index >/dev/null +if [ $(which update-apt-xapian-index) ] then PYTHONDONTWRITEBYTECODE=1 update-apt-xapian-index --force --quiet fi diff --git a/share/hooks/normal/0430-update-mlocate-database.hook.chroot b/share/hooks/normal/0430-update-mlocate-database.hook.chroot index 03502fdeb..df99386fe 100755 --- a/share/hooks/normal/0430-update-mlocate-database.hook.chroot +++ b/share/hooks/normal/0430-update-mlocate-database.hook.chroot @@ -8,7 +8,7 @@ set -e # means that if the live system is later installed to a hard disk then less # work will be required after installation. -if command -v updatedb.mlocate >/dev/null +if [ $(which updatedb.mlocate) ] then updatedb.mlocate fi |