From 0c65370ae5427a84f07a0a94fe20357dcf1bd3cf Mon Sep 17 00:00:00 2001
From: Gerhard Rieger <gerhard@dest-unreach.org>
Date: Fri, 30 Oct 2020 08:22:08 +0100
Subject: [PATCH] test.sh: Archlinux: No which; changes on ip,ss commands

---
 CHANGES |  3 +++
 test.sh | 10 +++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/CHANGES b/CHANGES
index 7ad4b53..b99de78 100644
--- a/CHANGES
+++ b/CHANGES
@@ -17,6 +17,9 @@ Testing:
 
 	Ubuntu 20.04 requires 2048 bit certificates with OpenSSL
 
+	Archlinux 2020 has not which command; its ip,ss commands have modified
+	version strings
+
 ####################### V 1.7.3.4:
 
 Corrections:
diff --git a/test.sh b/test.sh
index e83a68d..6e131f8 100755
--- a/test.sh
+++ b/test.sh
@@ -232,16 +232,16 @@ else
 fi
 
 if type ip >/dev/null 2>&1; then
-    if ip -V |grep -q "^ip utility, iproute2-ss"; then
-	IP=$(which ip)
+    if ip -V |grep -q "^ip utility, iproute2-"; then
+	IP=$(type -p ip)
     else
 	unset IP
     fi
 fi
 
 if type ss >/dev/null 2>&1; then
-    if ss -V |grep -q "^ss utility, iproute2-ss"; then
-	SS=$(which ss)
+    if ss -V |grep -q "^ss utility, iproute2-"; then
+	SS=$(type -p ss)
     else
 	unset SS
     fi
@@ -373,7 +373,7 @@ else
     SECONDIP6ADDR="[$SECONDIP6ADDR]"
 fi
 
-TRUE=$(which true)
+TRUE=$(type true)
 #E=-e	# Linux
 if   [ $(echo "x\c") = "x" ]; then E=""
 elif [ $(echo -e "x\c") = "x" ]; then E="-e"