Merge branch 'master' into release

benchie.sh

@@ -112,12 +112,6 @@ if [ -z "$BENCHMARK_COMMANDS" ]; then
     exit 1
 fi
 
-# OS-specific configuration
-OS_ALPINE=
-if cat /etc/os-release | grep -iE 'ID=alpine' > /dev/null 2>&1; then
-    OS_ALPINE='true'
-fi
-
 ## Create directories
 mkdir -p "$BENCHMARK_DATA_DIR"
 
@@ -141,23 +135,15 @@ if [ "$COMMAND" = 'status' ]; then
     # Returns pid
     echo "$BENCHMARK_COMMANDS" | while read -r c; do
         # Exclude these args: 1) grep 2) zombie processes or kernel threads starting with square bracket i.e. [foo]'
-        if [ "$OS_ALPINE" = 'true' ]; then
-            for i in $( ps aux | grep "$c" | grep -vE '^\s*[0-9]+\s+(grep|\[)' | awk '{print $1}'); do echo "$i"; done
-        else
-            for i in $( ps aux | grep "$c" | grep -vE '^\s*[0-9]+\s+(grep|\[)' | awk '{print $2}'); do echo "$i"; done
-        fi
+        for i in $( ps -Ao pid,args | grep "$c" | grep -vE '^\s*[0-9]+\s+(grep|\[)' | awk '{print $1}'); do echo "$i"; done
     done
 fi
 if [ "$COMMAND" = 'stop' ]; then
     # Stops benchmarks
     # Returns killed pid
     echo "$BENCHMARK_COMMANDS" | while read -r c; do
         # Exclude these args: 1) grep 2) zombie processes or kernel threads starting with square bracket i.e. [foo]'
-        if [ "$OS_ALPINE" = 'true' ]; then
-            for i in $( ps aux | grep "$c" | grep -vE '^\s*[0-9]+\s+(grep|\[)' | awk '{print $1}'); do echo "$i"; kill -9 "$i"; done
-        else
-            for i in $( ps aux | grep "$c" | grep -vE '^\s*[0-9]+\s+(grep|\[)' | awk '{print $2}'); do echo "$i"; kill -9 "$i"; done
-        fi
+        for i in $( ps -Ao pid,args | grep "$c" | grep -vE '^\s*[0-9]+\s+(grep|\[)' | awk '{print $1}'); do echo "$i"; kill -9 "$i"; done
     done
 fi
 if [ "$COMMAND" = 'clean' ]; then