diff options
| author | Ansuel Smith <ansuelsmth@gmail.com> | 2021-11-25 02:12:58 +0100 |
|---|---|---|
| committer | Paul Spooren <mail@aparcar.org> | 2022-01-17 09:14:26 +0100 |
| commit | 88204bfa82f982a986d2aa3e166a4c5946040308 (patch) | |
| tree | 7d10a3c76c12f1cdf00ec192cb40efe823a4f0d2 /scripts | |
| parent | 87d489f67a35968242cd4f192dc363dc87056844 (diff) | |
| download | openwrt-88204bfa82f982a986d2aa3e166a4c5946040308.tar.gz openwrt-88204bfa82f982a986d2aa3e166a4c5946040308.tar.bz2 openwrt-88204bfa82f982a986d2aa3e166a4c5946040308.zip | |
treewide: drop use of which
Ubuntu started to flag which as deprecated and it
seems which is not really standard and may vary
across Distro.
Drop the use of which and use the standard 'command -v'
for this simple task.
Which is still present in the prereq if some package/script
still use which.
A utility script called command_all.sh is implemented that
will just mimic the output of which -a.
Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/command_all.sh | 11 | ||||
| -rwxr-xr-x | scripts/download.pl | 4 | ||||
| -rwxr-xr-x | scripts/feeds | 2 | ||||
| -rwxr-xr-x | scripts/ubinize-image.sh | 2 |
4 files changed, 14 insertions, 5 deletions
diff --git a/scripts/command_all.sh b/scripts/command_all.sh new file mode 100755 index 0000000000..452b66f092 --- /dev/null +++ b/scripts/command_all.sh @@ -0,0 +1,11 @@ +#! /bin/sh +# SPDX-License-Identifier: GPL-2.0-or-later +# Reduced version of which -a using command utility + +case $PATH in + (*[!:]:) PATH="$PATH:" ;; +esac + +for ELEMENT in $(echo $PATH | tr ":" "\n"); do + PATH=$ELEMENT command -v "$@" +done diff --git a/scripts/download.pl b/scripts/download.pl index 8e6463c007..ebb0d7af19 100755 --- a/scripts/download.pl +++ b/scripts/download.pl @@ -54,10 +54,8 @@ sub localmirrors { sub which($) { my $prog = shift; - my $res = `which $prog`; + my $res = `command -v $prog`; $res or return undef; - $res =~ /^no / and return undef; - $res =~ /not found/ and return undef; return $res; } diff --git a/scripts/feeds b/scripts/feeds index bbfd832c45..f63b4f0951 100755 --- a/scripts/feeds +++ b/scripts/feeds @@ -14,7 +14,7 @@ chdir $ENV{TOPDIR}; $ENV{GIT_CONFIG_PARAMETERS}="'core.autocrlf=false'"; $ENV{GREP_OPTIONS}=""; -my $mk=`which gmake 2>/dev/null`; # select the right 'make' program +my $mk=`command -v gmake 2>/dev/null`; # select the right 'make' program chomp($mk); # trim trailing newline $mk or $mk = "make"; # default to 'make' diff --git a/scripts/ubinize-image.sh b/scripts/ubinize-image.sh index 0195695240..323eae547a 100755 --- a/scripts/ubinize-image.sh +++ b/scripts/ubinize-image.sh @@ -134,7 +134,7 @@ if [ ! -r "$rootfs" -a ! -r "$kernel" -a ! "$outfile" ]; then exit 1 fi -ubinize="$( which ubinize )" +ubinize="$( command -v ubinize )" if [ ! -x "$ubinize" ]; then echo "ubinize tool not found or not usable" exit 1 |