commit 995d6916db4df3ea325c11aa6cd8f48278f77bbf
author Thomas Vachuska <tom@onlab.us> Mon Jun 29 12:11:43 2015 -0700
committer Thomas Vachuska <tom@onlab.us> Mon Jun 29 12:11:43 2015 -0700
tree acd2128bf550dbd15e8cc718a1da688b663e31bb
parent 12bf44523983426352999f4260aa36e73f9c193c

Fixed "which -s" option, which does not work on Linux.

Change-Id: I56b73e88e18fbda13cac9443454f6b726803780d

tools/test/bin/onos

diff --git a/tools/test/bin/onos b/tools/test/bin/onos
index 21f8f13..63786d9 100755
--- a/tools/test/bin/onos
+++ b/tools/test/bin/onos
@@ -11,7 +11,7 @@
 
 [ -n "$1" ] && OCI=$(find_node $1) && shift
 
-if which -s client && [ -z "$ONOS_USE_SSH" ]; then
+if which client 2>/dev/null && [ -z "$ONOS_USE_SSH" ]; then
     # Use Karaf client only if we can and are allowed to
     unset KARAF_HOME
     client -h $OCI -u karaf "$@" 2>/dev/null