@@ -15,16 +15,16 @@ copy_binaries() {

 	fi

 	echo "Copying nested executables into $dir"

 	for file in containerd containerd-shim ctr runc docker-init docker-proxy rootlesskit rootlesskit-docker-proxy dockerd-rootless.sh; do

-		cp -f `which "$file"` "$dir/"

-		if [ "$hash" == "hash" ]; then

+		cp -f "$(command -v "$file")" "$dir/"

+		if [ "$hash" = "hash" ]; then

 			hash_files "$dir/$file"

 		fi

 	done

 	# vpnkit is amd64 only

-	if which "vpnkit.$(uname -m)" 2>&1 >/dev/null; then

-		cp -f `which "vpnkit.$(uname -m)"` "$dir/vpnkit"

-		if [ "$hash" == "hash" ]; then

+	if command -v "vpnkit.$(uname -m)" 2>&1 >/dev/null; then

+		cp -f "$(command -v "vpnkit.$(uname -m)")" "$dir/vpnkit"

+		if [ "$hash" = "hash" ]; then

 			hash_files "$dir/vpnkit"

 		fi

 	fi