Bump version to 0.5.0

This means that "init" session layouts can now be used to start and/or
re-attach to your main session.

Personally I have a "main" session layout with a couple of default
windows. I can now either start that session, or re-attach to it from
outside of Tmux by just running `tmuxifier s main`, instead of manually
creating a session named "main" and then loading my windows into it.

README.md

@@ -52,16 +52,31 @@ Which will yield a Tmux window looking like this:
 
 ## Installation
 
+Clone the repo to your machine:
+
 ```bash
 git clone https://github.com/jimeh/tmuxifier.git ~/.tmuxifier
 ```
 
-And add the following to your `~/.profile`, `~/.bash_profile` or equivalent:
+### bash & zsh
+
+And add the following to your `~/.profile`, `~/.bash_profile`, `~/.zshrc` or
+equivalent:
 
 ```bash
 [[ -s "$HOME/.tmuxifier/init.sh" ]] && source "$HOME/.tmuxifier/init.sh"
 ```
 
+### tcsh
+
+Add the following to your `~/.cshrc`, `~/.tcshrc` or equivalent:
+
+```tcsh
+if ( -s "$HOME/.tmuxifier/init.sh" ) then
+  source "$HOME/.tmuxifier/init.sh"
+endif
+```
+
 ## Usage
 
 *__Note:__ This section needs expanding upon.*
@@ -117,8 +132,8 @@ in it.
 ### Custom Installaton Path
 
 To install Tmuxifier to a custom path, clone the repository to your desired
-path and set `$TMUXIFIER` to that path, additionally loading `init.sh` from
-that same path.
+path and set `$TMUXIFIER` to that path, additionally loading `init.sh` or
+`init.tcsh` from that same path.
 
 ```bash
 export TMUXIFIER="$HOME/.dotfiles/tmuxifier"

completion/tmuxifier.tcsh

@@ -0,0 +1,2 @@
+complete tmuxifier 'p@1@`tmuxifier commands`@' \
+                   'p@2@`tmuxifier completions $:-1`@'

init.tcsh

@@ -0,0 +1,13 @@
+# Set tmuxifier root path.
+if ( ! $?TMUXIFIER ) then
+  setenv TMUXIFIER "${HOME}/.tmuxifier"
+endif
+
+# Add `bin` directroy to `$PATH`.
+set path = ( $TMUXIFIER/bin $path )
+
+# If `tmuxifier` is available, and `$TMUXIFIER_NO_COMPLETE` is not set, then
+# load tmuxifier shell completion.
+if ( ! $?TMUXIFIER_NO_COMPLETE ) then
+  which tmuxifier > /dev/null && source "$TMUXIFIER/completion/tmuxifier.tcsh"
+endif

lib/layout-helpers.sh

@@ -182,12 +182,10 @@ initialize_session() {
     fi
 
     # In order to ensure only specified windows are created, we move the
-    # default window to position 99, and later remove it with the
-    # `finalize_session` function.
-    tmux move-window -s "$session:0" -t "$session:99"
-
-    # Ensure correct pane splitting.
-    __go_to_session
+    # default window to position 999, and later remove it with the
+    # `finalize_and_go_to_session` function.
+    local first_window_index=$(__get_first_window_index)
+    tmux move-window -s "$session:$first_window_index" -t "$session:999"
 
     # Session created, return ok exit status.
     return 0
@@ -207,7 +205,7 @@ initialize_session() {
 # to it here.
 #
 finalize_and_go_to_session() {
-  ! tmux kill-window -t "$session:99" 2>/dev/null
+  ! tmux kill-window -t "$session:999" 2>/dev/null
   if [[ "$(tmuxifier-current-session)" != "$session" ]]; then
     __go_to_session
   fi
@@ -229,6 +227,16 @@ __expand_path() {
   echo $(eval echo "$@")
 }
 
+__get_first_window_index() {
+  local index
+  index=$(tmux list-windows -t "$session:" -F "#{window_index}" 2>/dev/null)
+  if [ -n "$index" ]; then
+    echo "$index" | head -1
+  else
+    echo "0"
+  fi
+}
+
 __go_to_session() {
   if [ -z "$TMUX" ]; then
     tmux -u attach-session -t "$session:"

libexec/tmuxifier-list-sessions

@@ -2,7 +2,7 @@
 set -e
 [ -n "$TMUXIFIER_DEBUG" ] && set -x
 
-list=$(find "$TMUXIFIER_LAYOUT_PATH" -name "*.session.sh")
+list=$(find -L "$TMUXIFIER_LAYOUT_PATH" -name "*.session.sh")
 for file in $list; do
   file=${file/$TMUXIFIER_LAYOUT_PATH\//}
   echo "  ${file/.session.sh/}"

libexec/tmuxifier-list-windows

@@ -2,7 +2,7 @@
 set -e
 [ -n "$TMUXIFIER_DEBUG" ] && set -x
 
-list=$(find "$TMUXIFIER_LAYOUT_PATH" -name "*.window.sh")
+list=$(find -L "$TMUXIFIER_LAYOUT_PATH" -name "*.window.sh")
 for file in $list; do
   file=${file/$TMUXIFIER_LAYOUT_PATH\//}
   echo "  ${file/.window.sh/}"

libexec/tmuxifier-load-session

@@ -18,9 +18,5 @@ fi
 # Load runtime functions.
 source "$TMUXIFIER/runtime.sh"
 
-if [ ! -z $TMUX ]; then
-  load_session "$1"
-else
-  echo "tmuxifier: 'load-session' command can only be used from within Tmux."
-  exit 1
-fi
+# Load session file.
+load_session "$1"

libexec/tmuxifier-version

@@ -2,4 +2,4 @@
 set -e
 [ -n "$TMUXIFIER_DEBUG" ] && set -x
 
-echo "0.3.1"
+echo "0.5.0"