diff options
| author | johnraff <github@rafflesnagoya.com> | 2020-03-12 14:37:21 +0900 |
|---|---|---|
| committer | Luca Boccassi <bluca@debian.org> | 2020-03-12 10:35:57 +0000 |
| commit | 2d9ab1f7f82f9a98b97d1503c1e3f31c86061c15 (patch) | |
| tree | 7e387db7a374aad1f0865147c0b3403e09c77ce3 /scripts/build/chroot_archives | |
| parent | 72a87fb70d26153bdfe06d0cdf42a199ff7ad68d (diff) | |
| download | vyos-live-build-2d9ab1f7f82f9a98b97d1503c1e3f31c86061c15.tar.gz vyos-live-build-2d9ab1f7f82f9a98b97d1503c1e3f31c86061c15.zip | |
Test for executables: replace 'which' with more robust 'command -v'
Instances of:
if [ $(which <command> ]
have been replaced with:
if command -v <command> >/dev/null
which is considered to be more robust in a range of environments.
scripts/build/chroot_archives: line 259:
if [ "${LB_APT}" = "aptitude" ] && [ ! $(Chroot chroot "which aptitude") ]
has been left untouched because the chroot might require a more complex command
which would need more testing.
manpages/Makefile: line 42:
@if [ ! -x "$$(which po4a 2>/dev/null)" ]; \
has been left untouched because I am not sufficiently familiar with makefiles.
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 b602caf4b..612f8f74a 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" ] && [ ! $(which aptitude) ] + if [ "${LB_APT}" = "aptitude" ] && ! command -v aptitude >/dev/null then Chroot chroot "apt-get ${APT_OPTIONS} update" Chroot chroot "apt-get ${APT_OPTIONS} install aptitude" |