diff options
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 |