.bin/tmux-projectinator

@@ -4,43 +4,15 @@
 set -o emacs
 bind '"\e": "\C-W\c-d"'
 
-OPEN_MODE="new_pane"
-
-while getopts ":l:v" option; do
-    case $option in
-        l)
-            OPEN_MODE="local"
-            ;;
-        v)
-            VERBOSE=true
-            ;;
-    esac
-done
-
-debug () {
-    if [ "$VERBOSE" = true ]; then
-        echo $1
-    fi
-}
-
-open_local () {
-    tmux send-keys "cd $PROJECT_PATH" Enter
-
-    # Close tmux popup if any
-    tmux display-popup -C
-}
-
-open_new_pane () {
+move_pane () {
     tmux has-session -t $SESSION_NAME 2>/dev/null
     if [ $? != 0 ]; then
-        debug "Session $SESSION_NAME missing, creating it."
         tmux new-session -s $SESSION_NAME -d -n $PROJECT_NAME -c $PROJECT_PATH
     fi
 
     tmux has-session -t $SESSION_NAME:$PROJECT_NAME 2>/dev/null
     if [ $? != 0 ]; then
-        debug "Window $PROJECT_NAME in $SESSION_NAME not found, creating it."
-        tmux new-window -t $SESSION_NAME -n $PROJECT_NAME -d -c $PROJECT_PATH
+        tmux new-window -t $SESSION_NAME: -n $PROJECT_NAME -d -c $PROJECT_PATH
     fi
 
     tmux switch-client -t $SESSION_NAME:$PROJECT_NAME
@@ -56,21 +28,21 @@ PROJECT_LIST=$(find ~/* -name .git -type d -prune 2>/dev/null)
 
 SELECTED=$(echo $PROJECT_LIST | sed 's/\/.git/\n/g' | sed "s/$(echo $HOME | sed 's/\//\\\//g')//" | cut -d'/' -f2- | fzf)
 
-debug "Selected $SELECTED"
-
-PROJECT_PATH=$(echo $PROJECT_LIST | sed 's/\/.git/\n/g' | grep "${SELECTED}$")
+PROJECT_PATH=$(echo $PROJECT_LIST | sed 's/\/.git/\n/g' | grep $SELECTED)
 PROJECT_ROOT=$(echo $SELECTED | cut -d '/' -f1)
 PROJECT_NAME=$(echo $SELECTED | rev | cut -d '/' -f1 | rev)
 
 SESSION_NAME=$([ -z "${CUSTOM_SESSIONS[$PROJECT_ROOT]}" ] && echo "$PROJECT_ROOT" || echo "${CUSTOM_SESSIONS[$PROJECT_ROOT]}")
 
-debug "Project path is $PROJECT_PATH"
+while getopts ":l" option; do
+    case $option in
+        l)
+            tmux send-keys "cd $PROJECT_PATH" Enter
 
-case $OPEN_MODE in
-    "new_pane")
-        open_new_pane
-        ;;
-    "local")
-        open_local
+            # Close tmux popup if any
+            tmux display-popup -C
             ;;
     esac
+done
+
+if [ $OPTIND -eq 1 ]; then move_pane "$SELECTED"; fi