From e928692c6903983ad1fb7a3b94f5520810c52f38 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Fri, 23 Apr 2021 14:47:18 +0900 Subject: [PATCH] dockerd-rootless.sh: use `command -v` instead of `which` `which` binary is often missing Signed-off-by: Akihiro Suda --- contrib/dockerd-rootless.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/dockerd-rootless.sh b/contrib/dockerd-rootless.sh index 3643a2a1c6..c8783dba22 100755 --- a/contrib/dockerd-rootless.sh +++ b/contrib/dockerd-rootless.sh @@ -35,7 +35,7 @@ fi rootlesskit="" for f in docker-rootlesskit rootlesskit; do - if which $f > /dev/null 2>&1; then + if command -v $f > /dev/null 2>&1; then rootlesskit=$f break fi @@ -53,7 +53,7 @@ fi net=$DOCKERD_ROOTLESS_ROOTLESSKIT_NET mtu=$DOCKERD_ROOTLESS_ROOTLESSKIT_MTU if [ -z $net ]; then - if which slirp4netns > /dev/null 2>&1; then + if command -v slirp4netns > /dev/null 2>&1; then # If --netns-type is present in --help, slirp4netns is >= v0.4.0. if slirp4netns --help | grep -qw -- --netns-type; then net=slirp4netns @@ -65,7 +65,7 @@ if [ -z $net ]; then fi fi if [ -z $net ]; then - if which vpnkit > /dev/null 2>&1; then + if command -v vpnkit > /dev/null 2>&1; then net=vpnkit else echo "Either slirp4netns (>= v0.4.0) or vpnkit needs to be installed"