diff options
| author | Lyndon Brown <jnqnfe@gmail.com> | 2020-02-22 14:33:01 +0000 |
|---|---|---|
| committer | Raphaël Hertzog <hertzog@debian.org> | 2020-03-09 10:51:11 +0000 |
| commit | 7ee59d408ed7681908966a5b2fb28e8f98116d31 (patch) | |
| tree | cd95c183cca6f26e624bd73b7271ea98913a2a83 /share | |
| parent | 37f0432e983f11e3bfa29842edd42ad66dd1a25e (diff) | |
| download | vyos-live-build-7ee59d408ed7681908966a5b2fb28e8f98116d31.tar.gz vyos-live-build-7ee59d408ed7681908966a5b2fb28e8f98116d31.zip | |
fix consistency in binary execution and existance checking
- prefer using `which` over hard coded paths
- it is redundant to check that the bin pointed to the return of
`which` exists and is executable, `which` already gives us
assurance of that if it returns true!
- the redirection of output (`2>/dev/null`) seems to be
unnecessary from my testing.
the instances relatnig to fdisk and losetup in functions/defaults.sh have
been left as they are since they get executed by `lb config` which can run
without sudo elevation unlike `lb build` and in that case `which` would
fail to find these binaries resulting in error.
this also fixes a bug showing an error for missing debootstrap - this tool
requires sudo privileges to run and thus is not found via a none elevated
which search.
Gbp-Dch: Short
Closes: #952927
Diffstat (limited to 'share')
4 files changed, 5 insertions, 5 deletions
diff --git a/share/bin/Packages b/share/bin/Packages index fa6cbbaa2..185fba78d 100755 --- a/share/bin/Packages +++ b/share/bin/Packages @@ -10,9 +10,9 @@ set -e -if [ ! -e /usr/bin/grep-aptavail ] +if [ ! $(which grep-aptavail) ] then - echo "E: /usr/bin/grep-aptavail: No such file." + echo "E: program grep-aptavail not found!" exit 1 fi 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 771e9032a..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 [ -x /usr/bin/apt-file ] && [ "${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 dcb39b261..02f1a18f2 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 [ -x /usr/sbin/update-apt-xapian-index ] +if [ $(which update-apt-xapian-index) ] then PYTHONDONTWRITEBYTECODE=1 /usr/sbin/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 6bfdb3d4f..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 [ -x /usr/bin/updatedb.mlocate ] +if [ $(which updatedb.mlocate) ] then updatedb.mlocate fi |