1 files changed, 9 insertions, 10 deletions

diff --git a/test/utils/utils.sh b/test/utils/utils.sh
index 102c8df17..647cbfb34 100755
--- a/test/utils/utils.sh
+++ b/test/utils/utils.sh
@@ -7,7 +7,7 @@ export MALLOC_CHECK_=3
 export MALLOC_PERTURB_=$(($RANDOM % 255 + 1))
 export LC_ALL=C
 
-if [ -f /etc/debian_version ]; then
+if [[ -f /etc/debian_version ]]; then
         libdir=$(dirname "$(dpkg -L firejail | grep fcopy)")
         export PATH="$PATH:$libdir"
 fi
@@ -33,13 +33,12 @@ echo "TESTING: version (test/utils/version.exp)"
 echo "TESTING: help (test/utils/help.exp)"
 ./help.exp
 
-which man 2>/dev/null
-if [ "$?" -eq 0 ];
+if command -v man
 then
-        echo "TESTING: man (test/utils/man.exp)"
-        ./man.exp
+        echo "TESTING: man (test/utils/man.exp)"
+        ./man.exp
 else
-        echo "TESTING SKIP: man not found"
+        echo "TESTING SKIP: man not found"
 fi
 
 echo "TESTING: list (test/utils/list.exp)"
@@ -48,12 +47,12 @@ echo "TESTING: list (test/utils/list.exp)"
 echo "TESTING: tree (test/utils/tree.exp)"
 ./tree.exp
 
-if [ $(grep -c ^processor /proc/cpuinfo) -gt 1 ];
+if [[ $(grep -c ^processor /proc/cpuinfo) -gt 1 ]]
 then
-        echo "TESTING: cpu.print (test/utils/cpu-print.exp)"
-        ./cpu-print.exp
+        echo "TESTING: cpu.print (test/utils/cpu-print.exp)"
+        ./cpu-print.exp
 else
-        echo "TESTING SKIP: cpu.print, not enough CPUs"
+        echo "TESTING SKIP: cpu.print, not enough CPUs"
 fi
 
 echo "TESTING: fs.print (test/utils/fs-print.exp)"