From 2d9ab1f7f82f9a98b97d1503c1e3f31c86061c15 Mon Sep 17 00:00:00 2001
From: johnraff <github@rafflesnagoya.com>
Date: Thu, 12 Mar 2020 14:37:21 +0900
Subject: 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.
---
 share/hooks/normal/0400-update-apt-file-cache.hook.chroot   | 2 +-
 share/hooks/normal/0410-update-apt-xapian-index.hook.chroot | 2 +-
 share/hooks/normal/0430-update-mlocate-database.hook.chroot | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'share/hooks')

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 4634d4cf8..c83225fe5 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 [ $(which apt-file) ] && [ "${LB_APT_INDICES}" = "true" ]
+if command -v apt-file >/dev/null && [ "${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 93801e511..f737ad171 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 [ $(which update-apt-xapian-index) ]
+if command -v update-apt-xapian-index >/dev/null
 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 df99386fe..03502fdeb 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 [ $(which updatedb.mlocate) ]
+if command -v updatedb.mlocate >/dev/null
 then
 	updatedb.mlocate
 fi
-- 
cgit v1.2.3