Don't corrupt output, cleanup procs

2 files changed, 35 insertions, 13 deletions

diff --git a/cleanup_processes.sh b/cleanup_processes.sh
deleted file mode 100644
index 144a01f..0000000
--- a/cleanup_processes.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-sed -i -e '/ubnt-websockets/s/^/#/' -e '/telnetd/s/^/#/' -e '/mca[-d]/s/^/#/' -e '/lighttpd/s/^/#/' /etc/inittab
-kill -HUP 1
-pkill -9 ubnt-websockets
-pkill -9 lighttpd
-pkill upnpd
-pkill telnetd
-pkill mca-monitor
-pkill mcad
-pkill avahi-daemon
diff --git a/power_control.sh b/power_control.sh
index c64a235..a3d9d88 100755
--- a/power_control.sh
+++ b/power_control.sh
@@ -41,17 +41,47 @@ report() {
                 echo -e "\t\t\"output\": $i,"
                 echo -e "\t\t\"engaged\": $state,"
                 echo -e "\t\t\"active_power\": $2,"
-                echo -e "\t\t\"energy_sum\": $6),"
+                echo -e "\t\t\"energy_sum\": $6,"
                 echo -e "\t\t\"current_rms\": $3,"
                 echo -e "\t\t\"voltage_rms\": $4,"
                 echo -e "\t\t\"power_factor\": $5"
                 echo -en "\t}"
 
-                [ $i -eq $NUM_OUTPUTS ] && echo -e ","
+                [ $i -ne $NUM_OUTPUTS ] && echo -e ","
         done
         echo "]"
 }
 
+disable_junk_processes() {
+    # Otherwise init will continue to respawn them
+    sed -i \
+        -e '/ubnt-websockets/s/^/#/' \
+        -e '/telnetd/s/^/#/' \
+        -e '/mca[-d]/s/^/#/' \
+        -e '/lighttpd/s/^/#/' \
+        /etc/inittab
+
+    kill -HUP 1
+
+    # Most of these kill cleanly but a few are stubborn so don't ask, tell.
+    pkill -9 ubnt-websockets
+    pkill -9 lighttpd
+    pkill upnpd
+    pkill telnetd
+    pkill mca-monitor
+    pkill mcad
+    pkill avahi-daemon
+}
+
+disable_blinking() {
+    echo 0 > /proc/led/freq
+    echo 1 > /proc/led/status
+}
+
+if ! grep -E '^#.*mcad$' /etc/inittab 2>&1 > /dev/null; then
+    disable_junk_processes
+    disable_blinking
+fi
 
 case $1 in
         on)
@@ -70,6 +100,9 @@ case $1 in
         clear)
                 clear_all
                 ;;
+    disable_blinking)
+        disable_blinking
+        ;;
         *)
                 error "Invalid command"
                 ;;