Merge branch 'uniform-interface'

[khatus.git] / bin / khatus

diff --git a/bin/khatus b/bin/khatus
index 8c67869..5fa635d 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'
@@ -126,11 +124,7 @@ main() {
             * )
                 if [ -v opts["$key"] ]
                 then
-                    if [ "$key" == "--debug" ]
-                    then
-                        opts["$key"]=1
-                        shift
-                    elif [ "$val" != "" ]
+                    if [ "$val" != "" ]
                     then
                         opts["$key"]="$val"
                         shift
@@ -208,24 +202,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 $@