Tighten bluetoothctl output matching to exclude logs

[khome.git] / home / lib / login_functions.sh

diff --git a/home/lib/login_functions.sh b/home/lib/login_functions.sh
index 3a9230f..243f15f 100644 (file)
--- a/home/lib/login_functions.sh
+++ b/home/lib/login_functions.sh
@@ -341,16 +341,20 @@ weather() {
     curl "http://wttr.in/$_weather_location?format=v2"
 }
 
+_bt_devs_infos() {
+    # grep's defintion of a line does not include \r, wile awk's does and
+    # which bluetoothctl outputs
+    awk '/^Device +/ {print $2}' \
+    | xargs -I% sh -c 'echo info % | bluetoothctl' \
+    | awk '/^Device |^\t[A-Z][A-Za-z0-9]+: /'
+}
+
 bt_devs_paired() {
-    bluetoothctl -- paired-devices \
-    | awk '{print $2}' \
-    | xargs bluetoothctl -- info
+    echo 'paired-devices' | bluetoothctl | _bt_devs_infos
 }
 
 bt_devs() {
-    bluetoothctl -- devices \
-    | awk '{print $2}' \
-    | xargs bluetoothctl -- info
+    echo 'devices' | bluetoothctl | _bt_devs_infos
 }
 
 run() {
@@ -447,7 +451,9 @@ motd() {
 
     echo
 
-    printf 'tmux sessions: %d\n' "$(tmux ls 2> /dev/null | wc -l)"
+    printf 'tmux: sessions %d, clients %d\n' \
+        "$(tmux list-sessions 2> /dev/null | wc -l)" \
+        "$(tmux list-clients  2> /dev/null | wc -l)"
 
     echo
 
@@ -540,7 +546,12 @@ motd() {
     echo
 
     echo 'Loggers'
-    awk '{split($5, prog, "["); print prog[1]}' /var/log/syslog \
+    awk '
+        {
+            split($5, prog, "[")
+            sub(":$", "", prog[1]) # if there were no [], than : will is left behind
+            print prog[1]
+        }' /var/log/syslog \
     | awk '
         {
             n = split($1, path, "/")  # prog may be in path form