Merge pull request #36 from tobixen/bugfix_ubuntutrusty

Bugfixes for Ubuntu Trusty

check_service.sh

@@ -79,13 +79,6 @@ if [[ $OS == linux ]]; then
                     LISTTOOL="sudo -u $USERNAME systemctl"
                 fi
 		TRUST_EXIT_CODE=1
-        elif command -v initctl >/dev/null 2>&1; then
-                SERVICETOOL="status $SERVICE"
-                LISTTOOL="initctl list"
-                if [ $USERNAME ]; then
-                    SERVICETOOL="sudo -u $USERNAME status $SERVICE"
-                    LISTTOOL="sudo -u $USERNAME initctl list"
-                fi
         elif command -v service >/dev/null 2>&1; then
                 SERVICETOOL="service $SERVICE status"
                 LISTTOOL="service --status-all"
@@ -93,6 +86,13 @@ if [[ $OS == linux ]]; then
                     SERVICETOOL="sudo -u $USERNAME service $SERVICE status"
                     LISTTOOL="sudo -u $USERNAME service --status-all"
                 fi
+        elif command -v initctl >/dev/null 2>&1; then
+                SERVICETOOL="status $SERVICE"
+                LISTTOOL="initctl list"
+                if [ $USERNAME ]; then
+                    SERVICETOOL="sudo -u $USERNAME status $SERVICE"
+                    LISTTOOL="sudo -u $USERNAME initctl list"
+                fi
         elif command -v chkconfig >/dev/null 2>&1; then
                 SERVICETOOL=chkconfig
                 LISTTOOL="chkconfig --list"
@@ -264,6 +264,14 @@ case $STATUS_MSG in
         echo "$STATUS_MSG"
         exit $CRITICAL
         ;;
+*NOT*running*)
+        echo "$STATUS_MSG"
+        exit $CRITICAL
+        ;;
+*NOT*RUNNING*)
+        echo "$STATUS_MSG"
+        exit $CRITICAL
+        ;;
 *inactive*)
         echo "$STATUS_MSG"
         exit $CRITICAL