fixup

1 files changed, 17 insertions, 13 deletions

diff --git a/shell-scripts/kakup b/shell-scripts/kakup
index d7a54f2..321b02a 100755
--- a/shell-scripts/kakup
+++ b/shell-scripts/kakup
@@ -1,15 +1,19 @@
-client="$(fd -d1 "." -t d $HOME $HOME/projects |
-    fzf |
-    {
-        pushd $(cat -) >/dev/null 2>&1
-        servers=kakoune-servers-${USER}  
-        name=${PWD#$HOME/} 
-        client=kakoune@$name
-        tmux has-session -t $servers || tmux new -d -s $servers kak -s $name -d\; rename-window $name
-        tmux list-windows -t $servers -F "#{window_name}" | grep $name >/dev/null 2>&1 || tmux new-window -t $servers -d kak -s $name -d\; rename-window $name
-        tmux has-session -t $client || tmux new -d -s $client kak -c $name
-        popd >/dev/null 2>&1
+session-or-client() {
+        {
+            pushd $(cat -)
+            export servers=kakoune-servers-${USER}
+            export name=${PWD#$HOME/}
+            export name=${name//\//-}
+            export client=kakoune@$name
+
+            tmux has-session -t $servers || tmux new -d -s $servers kak -s $name -d\; rename-window $name
+            tmux list-windows -t $servers -F "#{window_name}" | grep $name || tmux new-window -t $servers -d kak -s $name -d
+            tmux has-session -t $client || tmux new -d -s $client kak -c $name
+            popd
+        } </dev/stdin >/dev/null 2>&1
         echo $client
-    })"
-echo "client"
+}
+
+client="$(fd -d1 "." -t d $HOME $HOME/projects | fzf | session-or-client)"
+echo "client: $client"
 tmux attach -t "$client"