From 0e5d0483e5596e200430d28356b808af76806439 Mon Sep 17 00:00:00 2001 From: johnraff 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. --- scripts/build/chroot_archives | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts/build/chroot_archives') diff --git a/scripts/build/chroot_archives b/scripts/build/chroot_archives index e170d5be0..7dc7b32fb 100755 --- a/scripts/build/chroot_archives +++ b/scripts/build/chroot_archives @@ -236,7 +236,7 @@ case "${_ACTION}" 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" -- cgit v1.2.3