Update bt_devs functions to what currently works

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

diff --git a/home/lib/login_functions.sh b/home/lib/login_functions.sh
index 9f06a6b..6b0c1bc 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/'
+}
+
 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,7 @@ motd() {
 
     echo
 
-    printf 'tmux: sessions %d, clients: %d\n' \
+    printf 'tmux: sessions %d, clients %d\n' \
         "$(tmux list-sessions 2> /dev/null | wc -l)" \
         "$(tmux list-clients  2> /dev/null | wc -l)"