Normalize alert msg

[khatus.git] / bin / khatus

diff --git a/bin/khatus b/bin/khatus
index 8c67869..747fd32 100755 (executable)
--- a/bin/khatus
+++ b/bin/khatus
@@ -87,13 +87,11 @@ fork_poller() {
 
 main() {
     declare -A opts=(
-        ["--debug"]=0
         ["--dir_bin"]="$HOME/bin"
         ["--dir_perf_logs"]=''
         ["--file_pipe"]=$(mktemp)
         ["--weather_station_id"]='KJFK'
         ["--screen_brightness_device_name"]='acpi_video0'
-        ["--net_interfaces_to_show"]=''  # comma-separated
         ["--wifi_interface"]=''
         ["--disk_space_device"]='/'
         ["--disk_io_device"]='sda'
@@ -101,6 +99,7 @@ main() {
         ["--fan_path"]='/proc/acpi/ibm/fan'
         ["--pulseaudio_sink"]='0'
         ["--interval_datetime"]=1
+        ["--interval_procs"]=1
         ["--interval_brightness"]=1
         ["--interval_weather"]=$(( 30 * 60))  # 30 minutes
         ["--interval_mpd"]=1
@@ -126,11 +125,7 @@ main() {
             * )
                 if [ -v opts["$key"] ]
                 then
-                    if [ "$key" == "--debug" ]
-                    then
-                        opts["$key"]=1
-                        shift
-                    elif [ "$val" != "" ]
+                    if [ "$val" != "" ]
                     then
                         opts["$key"]="$val"
                         shift
@@ -193,7 +188,9 @@ main() {
     cmd_sens_memory="khatus_sensor_memory $bin"
 
     fork_watcher                                           "$pipe" "$bin" "khatus_sensor_energy $bin"
+    fork_watcher                                           "$pipe" "$bin" "khatus_sensor_devices $bin"
     fork_poller "${opts['--interval_datetime']}"   "$perf" "$pipe" "$bin" khatus_sensor_datetime
+    fork_poller "${opts['--interval_procs']}"      "$perf" "$pipe" "$bin" "khatus_sensor_procs $bin"
     fork_poller "${opts['--interval_brightness']}" "$perf" "$pipe" "$bin" "$cmd_sens_screen_brightness"
     fork_poller "${opts['--interval_weather']}"    "$perf" "$pipe" "$bin" "$cmd_sens_weather"
     fork_poller "${opts['--interval_mpd']}"        "$perf" "$pipe" "$bin" "$cmd_sens_mpd"
@@ -208,24 +205,7 @@ main() {
     fork_poller "${opts['--interval_fan']}"        "$perf" "$pipe" "$bin" "$cmd_sens_fan"
     fork_poller "${opts['--interval_mem']}"        "$perf" "$pipe" "$bin" "$cmd_sens_memory"
 
-    stdbuf -o L tail -f "$pipe" \
-    | stdbuf -o L tee \
-        >(stdbuf -o L "$bin"/khatus_bar \
-            -F "$MSG_FS" \
-            -v opt_debug=""${opts['--debug']}"" \
-            -v opt_mpd_song_max_chars=10 \
-            -v opt_net_interfaces_to_show="${opts['--net_interfaces_to_show']}" \
-            -v opt_pulseaudio_sink="${opts['--pulseaudio_sink']}" \
-        | "$bin"/khatus_actuate_status_bar_to_xsetroot_name \
-        ) \
-        >(stdbuf -o L "$bin"/khatus_monitor_energy \
-        | "$bin"/khatus_actuate_alert_to_notify_send \
-        ) \
-        >(stdbuf -o L "$bin"/khatus_monitor_errors \
-        | "$bin"/khatus_actuate_alert_to_notify_send \
-        ) \
-    > /dev/null
-
+    stdbuf -o L tail -f "$pipe"
 }
 
 main $@