should check if fzf exited

1 files changed, 7 insertions, 2 deletions

diff --git a/shell-scripts/kakup b/shell-scripts/kakup
index 321b02a..5061a8a 100755
--- a/shell-scripts/kakup
+++ b/shell-scripts/kakup
@@ -1,14 +1,19 @@
 session-or-client() {
         {
             pushd $(cat -)
+	    DIRSTACK
             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
+            tmux list-windows -t $servers -F "#{window_name}" | grep $name || tmux new-window -t $servers -n $name -d kak -s $name -d
+	    if [[ -z $TMUX ]]; then
+                tmux has-session -t $client || tmux new -d -s $client -n $name kak -c $name
+	    else
+    	    	tmux new-window -n $name kak -c $name
+            fi
             popd
         } </dev/stdin >/dev/null 2>&1
         echo $client