various fixes

[distro-setup] / system-status

diff --git a/system-status b/system-status
index ae37d3b02cf26782d07ac1a90019403d0c1699d0..745e33515fa5c0cc47996b7bc0a7b2d402ebab67 100755 (executable)
--- a/system-status
+++ b/system-status
@@ -309,6 +309,20 @@ write-status() {
     # check email.
     $MAIL_HOST)
       p $qmsg | loday -120 qlen
+
+
+      f=/var/spool/exim4/gw/no-delay-eximids
+      if (( loop_count % 10 == 0 )) && \
+           [[ -s $f ]] && [[ $(cat $f) == all ]]; then
+        # I've left this on longer than I intended, so just auto-delete
+        # it after some time.
+        find $f -mmin +180 -delete
+        if [[ -s $f ]]; then
+          chars+=("NO_DELAY")
+        fi
+      fi
+
+
       ;;
     *)
       rmg /home/iank/cron-errors/qlen*
@@ -433,7 +447,12 @@ write-status() {
       echo "ps_char=\"${chars[*]} \$ps_char\"" >>$status_file
     fi
   fi
-}
+
+  if [[ -e $HOME/.iank-stream-on ]] && ! pgrep -fc '^ffmpeg.*icecast://source.*/fsf-sysops' >/dev/null; then
+    rm -f $HOME/.iank-stream-on
+  fi
+
+} # end write-status
 
 # This prevents me having to mute notifications when I'm going to bed.
 mute() {
@@ -483,24 +502,10 @@ main-loop() {
     if [[ -e /sys/class/power_supply/AC/online && $(</sys/class/power_supply/AC/online) == 0 ]]; then
       power=false
     fi
-    wait=15
 
     if $power; then
-      if (( loop_count  % 10 == 0 )); then
-        if [[ -r /sys/class/power_supply/BAT0/capacity ]]; then
-          bat=$(cat /sys/class/power_supply/BAT0/capacity)
-        else
-          bat=100
-        fi
-        case $bat in
-          100|9?)
-          :
-          bitcoinon &
-          ;;
-        esac
-      fi
+      wait=15
     else
-      bitcoinoff
       wait=60
     fi