Bump version to 0.11.3

Source missing utility functions in tmuxifier-tmux

README.md

@@ -71,8 +71,8 @@ set path = ( "~/.tmuxifier/bin" $path )
 
 __In fish:__
 
-```fish
+```bash
-set -gx PATH "~/.tmuxifier/bin $PATH
+set -gx PATH "~/.tmuxifier/bin" $PATH
 ```
 
 ### Custom Installation Path
@@ -104,23 +104,25 @@ __In fish:__
 
 And add the following to your `~/.config/fish/config.fish` or equivalent:
 
-```fish
+```bash
 eval (tmuxifier init -)
 ```
 
-If you need to pass custom arguments to tmux itself, you can do so by setting
+### Custom Tmux Arguments
-the `TMUXIFIER_TMUX_OPTS` environment variable. For example to set global
+
-arguments:
+If you need to pass custom arguments to `tmux` itself, you can do so by
+setting the `TMUXIFIER_TMUX_OPTS` environment variable. For example to set
+custom arguments globally:
 
 ```bash
 export TMUXIFIER_TMUX_OPTS="-L my-awesome-socket-name"
 eval "$(tmuxifier init -)"
 ```
 
-Or dynamically when calling `tmuxifier`:
+And/or specify dynamically when calling `tmuxifier`:
 
 ```bash
-TMUXIFIER_TMUX_OPTS="-L other-session" tmuxifier load-session welcome
+TMUXIFIER_TMUX_OPTS="-L other-socket" tmuxifier load-session welcome
 ```
 
 ## Updating

bin/tmuxifier

@@ -21,16 +21,28 @@ abs_dirname() {
 }
 
 if [ -z "${TMUXIFIER}" ]; then
+  # Set TMUXIFIER relative to the "tmuxifier" executable.
   export TMUXIFIER="$(dirname "$(abs_dirname "$0")")"
 else
+  # Strip any trailing slash (/) characters from TMUXIFIER variable.
   export TMUXIFIER="${TMUXIFIER%/}"
 fi
 
 # Load tmuxifier environment variables.
 source "$TMUXIFIER/lib/env.sh"
 
+# Add tmuxifier's internal commands to PATH.
 export PATH="$TMUXIFIER/libexec:$PATH"
 
+# Check Tmux version.
+export TMUXIFIER_MIN_TMUX_VERSION="1.6"
+if [ "$(tmuxifier-tmux-version "$TMUXIFIER_MIN_TMUX_VERSION")" == "<" ]; then
+  echo -e "ERROR: Tmuxifier requires Tmux v${TMUXIFIER_MIN_TMUX_VERSION}" \
+       "or newer. You have v$(tmuxifier-tmux-version)." >&2
+  exit 1
+fi
+
+# Parse given command
 command="$1"
 case "$command" in
   "" | "-h" | "--help" )

lib/layout-helpers.sh

@@ -270,9 +270,9 @@ initialize_session() {
 
 # Finalize session creation and then switch to it if needed.
 #
-# When the session is created, it leaves a unused window in position #99, this
+# When the session is created, it leaves a unused window in position #999,
-# is the default window which was created with the session, but it's also a
+# this is the default window which was created with the session, but it's also
-# window that was not explicitly created. Hence we kill it.
+# a window that was not explicitly created. Hence we kill it.
 #
 # If the session was created, we've already been switched to it. If it was not
 # created, the session already exists, and we'll need to specifically switch
@@ -302,8 +302,9 @@ __expand_path() {
 }
 
 __get_first_window_index() {
-  local index
+  local index=$(tmuxifier-tmux list-windows -t "$session:" \
-  index=$(tmuxifier-tmux list-windows -t "$session:" -F "#{window_index}" 2>/dev/null)
+    -F "#{window_index}" 2>/dev/null)
+
   if [ -n "$index" ]; then
     echo "$index" | head -1
   else

libexec/tmuxifier-help

@@ -35,7 +35,7 @@ Some useful tmuxifier commands are:
    new-window     nw       Create new window layout and open it with \$EDITOR.
    edit-session   es       Edit specified session layout with \$EDITOR.
    edit-window    ew       Edit specified window layout with \$EDITOR.
-   commands                List all tmuxifier commands.
+   commands                List all tmuxifier commands (including internal).
    version                 Print Tmuxifier version.
    help                    Show this message.
 

libexec/tmuxifier-tmux

@@ -2,4 +2,16 @@
 set -e
 [ -n "$TMUXIFIER_DEBUG" ] && set -x
 
+# Load internal utility functions.
+source "$TMUXIFIER/lib/util.sh"
+
+# Provide tmuxifier help
+if [[ " $@ " == *" --help "* ]]; then
+  echo "usage: tmuxifier tmux [...]
+
+Wrapper command for Tmux executable allowing Tmuxifier to pass in any custom
+arguments specified in the TMUXIFIER_TMUX_OPTS environment variable."
+  exit
+fi
+
 tmux $TMUXIFIER_TMUX_OPTS "$@"

libexec/tmuxifier-tmux-version

@@ -9,10 +9,9 @@ source "$TMUXIFIER/lib/util.sh"
 if calling-help "$@"; then
   echo "usage: tmuxifier tmux-version [target-version]
 
-Outputs current Tmux version. If given optional target-version it uses the
+Outputs current Tmux version. If given optional target-version it outputs one
-compare-versions command to output one of three possible characters indicating
+of three possible characters indicating if the current Tmux version number is
-if the current Tmux version is equal to, less, or higher version than the
+equal to, less than, or greater than the [target-version].
-the [target-version].
 
 The three possible outputs are \"=\", \"<\", and \">\"."
   exit

libexec/tmuxifier-version

@@ -13,4 +13,4 @@ Outputs Tmuxifier version."
   exit
 fi
 
-echo "0.10.0"
+echo "0.11.3"

templates/window.sh

@@ -16,7 +16,7 @@ new_window "{{WINDOW_NAME}}"
 
 # Paste text
 #send_keys "top"    # paste into active pane
-#send_keys "date" 1 # paste into active pane
+#send_keys "date" 1 # paste into pane 1
 
 # Set active pane.
 #select_pane 0