X-Git-Url: https://git.xandkar.net/?a=blobdiff_plain;f=home%2Flib%2Flogin_functions.sh;h=335f6fdf6b6d368da67c3f013b2c9326ccb43ac9;hb=cd113e384290fd446e1900981a88c5ffc1811c1e;hp=a691958baa3de86d573509658d0755fc6c8469e5;hpb=549b689caf4f12615520e6558b011ffbaf2bad09;p=khome.git

diff --git a/home/lib/login_functions.sh b/home/lib/login_functions.sh
index a691958..335f6fd 100644
--- a/home/lib/login_functions.sh
+++ b/home/lib/login_functions.sh
@@ -674,6 +674,7 @@ status() {
 
     echo 'accounting'
 
+    # TODO Bring back seesion and client listing, but per server/socket.
     printf '%stmux\n' "$indent_unit"
     ps -eo comm,cmd \
     | awk '
@@ -681,18 +682,27 @@ status() {
         #     "tmux: server    tmux -L pistactl new-session -d -s pistactl"
         #     "tmux: client    tmux -L foo"
         #     "tmux: client    tmux -Lbar"
+        #     "tmux: client    tmux"
+        #     "tmux: server    tmux -L foo -S bar" <-- -S takes precedence
         /^tmux:/ {
             # XXX This of course assumes pervasive usage of -L
             # TODO Handle -S
             role=$2
+
+            split($0, sides_of_S, "-S")
+            split(sides_of_S[2], words_right_of_S, FS)
+
             split($0, sides_of_L, "-L")
             split(sides_of_L[2], words_right_of_L, FS)
-            sock=words_right_of_L[1]
-            if (!sock) {
-                sock = "default"
+
+            if (words_right_of_S[1]) {
+                sock = "path." words_right_of_S[1]
+            } else if (words_right_of_L[1]) {
+                sock = "name." words_right_of_L[1]
             } else {
-                sock = "\"" sock "\""
+                sock = "default"
             }
+
             roles[role]++
             socks[sock]++
             count[role, sock]++