1 files changed, 10 insertions, 14 deletions

diff --git a/test/environment/environment.sh b/test/environment/environment.sh
index da9c170b9..c88c91741 100755
--- a/test/environment/environment.sh
+++ b/test/environment/environment.sh
@@ -7,7 +7,6 @@ export MALLOC_CHECK_=3
 export MALLOC_PERTURB_=$(($RANDOM % 255 + 1))
 export LC_ALL=C
 
-
 echo "TESTING: timeout (test/environment/timeout.exp)"
 ./timeout.exp
 
@@ -39,13 +38,12 @@ echo "TESTING: environment variables (test/environment/env.exp)"
 echo "TESTING: firejail in firejail - single sandbox (test/environment/firejail-in-firejail.exp)"
 ./firejail-in-firejail.exp
 
-which aplay 2>/dev/null
-if [ "$?" -eq 0 ] && [ "$(aplay -l | grep -c "List of PLAYBACK")" -gt 0 ];
+if command -v aplay && [[ $(aplay -l | grep -c "List of PLAYBACK") -gt 0 ]]
 then
-        echo "TESTING: sound (test/environment/sound.exp)"
-        ./sound.exp
+        echo "TESTING: sound (test/environment/sound.exp)"
+        ./sound.exp
 else
-        echo "TESTING SKIP: no aplay or sound card found"
+        echo "TESTING SKIP: no aplay or sound card found"
 fi
 
 echo "TESTING: nice (test/environment/nice.exp)"
@@ -54,26 +52,24 @@ echo "TESTING: nice (test/environment/nice.exp)"
 echo "TESTING: quiet (test/environment/quiet.exp)"
 ./quiet.exp
 
-which strace 2>/dev/null
-if [ "$?" -eq 0 ];
+if command -v strace
 then
-        echo "TESTING: --allow-debuggers (test/environment/allow-debuggers.exp)"
-        ./allow-debuggers.exp
+        echo "TESTING: --allow-debuggers (test/environment/allow-debuggers.exp)"
+        ./allow-debuggers.exp
 else
-        echo "TESTING SKIP: strace not found"
+        echo "TESTING SKIP: strace not found"
 fi
 
 # to install ibus:
 #       $ sudo apt-get install ibus-table-array30
 #       $ ibus-setup
 
-find ~/.config/ibus/bus | grep unix-0
-if [ "$?" -eq 0 ];
+if find ~/.config/ibus/bus | grep unix-0
 then
         echo "TESTING: ibus (test/environment/ibus.exp)"
         ./ibus.exp
 else
-        echo "TESTING SKIP: ibus not configured"
+        echo "TESTING SKIP: ibus not configured"
 fi
 
 echo "TESTING: rlimit (test/environment/rlimit.exp)"