From 0e5d0483e5596e200430d28356b808af76806439 Mon Sep 17 00:00:00 2001
From: johnraff <github@rafflesnagoya.com>
Date: Fri, 1 May 2020 11:23:39 +0900
Subject: Replace 'which' with 'command -v' to test for the existance of an
 executable This is considered to be more robust.

Two instances remain:

scripts/build/chroot_archives, line 257:
if [ "${LB_APT}" = "aptitude" ] && [ ! $(Chroot chroot "which aptitude") ]
The command is run inside a chroot where the environment might be special,
and would need further testing.

manpages/Makefile, line 42:
@if [ ! -x "$$(which po4a 2>/dev/null)" ]; \
I am insufficiently familiar with makefile syntax to edit this.
---
 share/bin/Packages                                          | 2 +-
 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 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'share')

diff --git a/share/bin/Packages b/share/bin/Packages
index ad69fad83..60cd999fc 100755
--- a/share/bin/Packages
+++ b/share/bin/Packages
@@ -11,7 +11,7 @@
 
 set -e
 
-if [ ! $(which grep-aptavail) ]
+if ! command -v grep-aptavail >/dev/null
 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 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