commit e10d20ec84f3ce076806d678ebfccba726a6f37e
author Radu Cotescu <radu@apache.org> Wed Jul 31 14:50:34 2019 +0200
committer Radu Cotescu <radu@apache.org> Wed Jul 31 14:50:34 2019 +0200
tree b6b343df603dc7b38e0a41188a670162770c4a18
parent 6ecff0f72a068f6dd55ecffc9a7b460a3ae36483

starting & stopping grip is more resilient

add-badges.sh

diff --git a/add-badges.sh b/add-badges.sh
index 0278326..9e180d8 100755
--- a/add-badges.sh
+++ b/add-badges.sh
@@ -9,13 +9,10 @@
 }
 
 function stop_grip() {
-    if [[ "${GRIP_PID}" -gt "-1" ]]; then
-        GRIP_PID_CHECK=$(pgrep -f grip)
-        if [[ ${GRIP_PID} -eq ${GRIP_PID_CHECK} ]]; then
-            echo "Stoping grip..."
-            kill $GRIP_PID 2>&1 > /dev/null
-            echo "Done."
-        fi
+    if [[ (-n "$GRIP_PID") && ("$GRIP_PID" != "-1") ]]; then
+        echo "Stoping grip..."
+        kill -9 $GRIP_PID 2>&1 > /dev/null
+        echo "Done."
     fi
 }
 
@@ -141,17 +138,13 @@
     LINE="[<img src=\"https://sling.apache.org/res/logos/sling.png\"/>](https://sling.apache.org)\n\n"
     prepend
     
-    grip --quiet -b 
-    if [[ "$?" -ne "0" ]]; then
-        GRIP_PID=$(pgrep -f grip)
-        if [[ -n ${GRIP_PID} ]]; then
-            echo "Found previous grip server running"
-        fi
-    else
-        GRIP_PID=$!
+
+    GRIP_PID=$(pgrep -f grip)
+    if [[ -n $GRIP_PID} ]]; then
+        stop_grip 2>&1 > /dev/null
     fi
-    
-    
+    grip -b > /dev/null 2>&1 & > /dev/null
+    GRIP_PID=$(pgrep -f grip)
     if [[ ${AUTO_COMMIT} -eq 1 ]]; then
         RESULTS="C"
     else