Merge branch 'command-v' into 'main'

Use `command -v` instead of `which`

See merge request apt-team/apt!193

1 files changed, 1 insertions, 12 deletions

diff --git a/cmdline/apt-key.in b/cmdline/apt-key.in
index baf3df5c3..137546de3 100644
--- a/cmdline/apt-key.in
+++ b/cmdline/apt-key.in
@@ -92,18 +92,7 @@ requires_root() {
 
 command_available() {
     if [ -x "$1" ]; then return 0; fi
-    # command -v "$1" >/dev/null 2>&1 # not required by policy, see #747320
-    # which "$1" >/dev/null 2>&1 # is in debianutils (essential) but not on non-debian systems
-    local OLDIFS="$IFS"
-    IFS=:
-    for p in $PATH; do
-	if [ -x "${p}/${1}" ]; then
-	    IFS="$OLDIFS"
-	    return 0
-	fi
-    done
-    IFS="$OLDIFS"
-    return 1
+    command -v "$1" >/dev/null # required by policy, see #747320
 }
 
 escape_shell() {