Move failed probes to the beginning

[sgmon.git] / run.sh

diff --git a/run.sh b/run.sh
index 13ff28e8a32547c0165a149fc29532a18b11ce15..3bc7a880afae6d37409f4c72ed488228dc100d20 100755 (executable)
--- a/run.sh
+++ b/run.sh
@@ -5,14 +5,15 @@ export SGMONDIR="$(dirname "$(realpath -- "$0")")"
 [ -z "$1" ] && SGMONSRV="$(basename "$PWD")" || SGMONSRV="$1"
 export SGMONSRV
 export SGMONTMP=`mktemp -d -t sgmon`
-trap "rm -fr $SGMONTMP" HUP PIPE INT QUIT TERM EXIT
 rm -f state
 ln -s $SGMONTMP state
+trap "rm -fr state $SGMONTMP" HUP PIPE INT QUIT TERM EXIT
 
 while : ; do
     [ -s max-attempts ] && read max_attempts < max-attempts || max_attempts=1
     [ -s state/attempts ] && read attempts < state/attempts || attempts=0
-    if ./run >state/stdout 2>state/stderr ; then
+    [ -x run ] && cmd=./run || cmd="sh -e run"
+    if $cmd >state/stdout 2>state/stderr ; then
         if [ "$attempts" -ge "$max_attempts" ] ; then
             "$SGMONDIR"/notify-ok.sh
         fi