others: btcheck/mysql: cosmetics

release/src-rt-6.x.4708/router/others/btcheck

@@ -1,5 +1,7 @@
 #!/bin/sh
 
+# Script for checking/adding transmission to cron
+
 BTON=$(nvram get bt_enable)
 BTCH=$(nvram get bt_check)
 
@@ -17,20 +19,16 @@ case "$1" in
 					cru a btinside "*/$INTERVAL * * * * /usr/bin/btcheck check"
 				}
 			} || {
-				[ "$ISCRU" -eq 1 ] && {
+				[ "$ISCRU" -eq 1 ] && cru d btinside
-					cru d btinside
-				}
 			}
 		} || {
-			[ "$ISCRU" -eq 1 ] && {
+			[ "$ISCRU" -eq 1 ] && cru d btinside
-				cru d btinside
-			}
 		}
 	;;
 	check)
 		[ "$BTON" -eq 1 -a "$BTCH" -eq 1 ] && {
-			ps | grep -q '[t]ransmission-daemon' || {
+			pidof transmission-daemon >/dev/null || {
-				logger Transmission stopped? Starting...
+				logger -t btcheck "Transmission stopped? Starting..."
 				service bittorrent restart
 			}
 		}

release/src-rt-6.x.4708/router/others/mycheck

@@ -1,41 +1,37 @@
 #!/bin/sh
 
-# Script for checking/adding to cron MySQL
+# Script for checking/adding MySQL to cron
+
+MYON=$(nvram get mysql_enable)
+MYCH=$(nvram get mysql_check)
 
 case "$1" in
 	addcru)
 		ISCRU=$(cru l | grep mysql_inside | wc -l)
-
 		INTERVAL=$(nvram get mysql_check_time)
 
-		BTON=$(nvram get mysql_enable)
+		[ "$MYON" -eq 1 ] && {
-		[ "$BTON" == "1" ] && {
+			[ "$MYCH" -eq 1 ] && {
-			BTCH=$(nvram get mysql_check)
+				[ "$ISCRU" -eq 0 ] && {
-			[ "$BTCH" == "1" ] && {
-				[ "$ISCRU" == "0" ] && {
 					cru a mysql_inside "*/$INTERVAL * * * * /usr/bin/mycheck check"
 				} || {
 					cru d mysql_inside
 					cru a mysql_inside "*/$INTERVAL * * * * /usr/bin/mycheck check"
 				}
 			} || {
-				[ "$ISCRU" == "1" ] && cru d mysql_inside
+				[ "$ISCRU" -eq 1 ] && cru d mysql_inside
 			}
 		} || {
-			[ "$ISCRU" == "1" ] && cru d mysql_inside
+			[ "$ISCRU" -eq 1 ] && cru d mysql_inside
 		}
 	;;
 	check)
-		BTON=$(nvram get mysql_enable)
+		[ "$MYON" -eq 1 -a "$MYCH" -eq 1 ] && {
-		[ "$BTON" == "1" ] && {
+			pidof mysqld >/dev/null || {
-			BTCH=$(nvram get mysql_check)
+				logger -t mycheck "MySQL stopped? Starting..."
-			[ "$BTCH" == "1" ] && {
-				ps | grep -q '[m]ysqld' || {
-					logger MySQL stopped? Starting...
 				service mysql restart
 			}
 		}
-		}
 	;;
 esac
 exit 0