adphi/oh-my-zsh
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixing typos, logic, and gremlins in tmux plugin.

Browse Source
This commit is contained in:
Josh Matthews 2013-02-26 21:47:11 -05:00
parent bf40d4e354
commit 7b15627851
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
plugins/tmux/tmux.plugin.zsh
View File

@ -6,7 +6,7 @@
# Automatically close the terminal when tmux exits # Automatically close the terminal when tmux exits
[[ -n "$ZSH_TMUX_AUTOQUIT" ]] || ZSH_TMUX_AUTOQUIT=$ZSH_TMUX_AUTOSTART [[ -n "$ZSH_TMUX_AUTOQUIT" ]] || ZSH_TMUX_AUTOQUIT=$ZSH_TMUX_AUTOSTART
# Set term to screen or screen-256color based on current terminal support # Set term to screen or screen-256color based on current terminal support
[[ -n "$ZSH_TMUX_FIXTERM" ]] || ZSH_TMUX_AUTOCONNECT=true [[ -n "$ZSH_TMUX_FIXTERM" ]] || ZSH_TMUX_FIXTERM=true
# Get the absolute path to the current directory # Get the absolute path to the current directory
local zsh_tmux_plugin_path="$(cd "$(dirname "$0")" && pwd)" local zsh_tmux_plugin_path="$(cd "$(dirname "$0")" && pwd)"
@ -14,49 +14,50 @@ local zsh_tmux_plugin_path="$(cd "$(dirname "$0")" && pwd)"
# Determine if the terminal supports 256 colors # Determine if the terminal supports 256 colors
if [[ `tput colors` == "256" ]] if [[ `tput colors` == "256" ]]
then then
export $ZSH_TMUX_TERM="screen-256" export ZSH_TMUX_TERM="screen-256color"
else else
export $ZSH_TMUX_TERM="screen" export ZSH_TMUX_TERM="screen"
fi fi
# Local variable to store the local config file to use, if any. # Local variable to store the local config file to use, if any.
local fixed_config="" local fixed_config=""
# Set the correct local config file to use # Set the correct local config file to use.
if [[ "$ZSH_TMUX_FIXTERM" == "true" ]] if [[ "$ZSH_TMUX_FIXTERM" == "true" ]]
then then
if [[ -f $HOME/.tmux.conf || -h $HOME/.tmux.conf ]] if [[ -f $HOME/.tmux.conf || -h $HOME/.tmux.conf ]]
then then
#use this when they have a ~/.tmux.conf #use this when they have a ~/.tmux.conf
fixed_config=$zsh_tmux_plugin_path/tmux.extra.conf fixed_config="$zsh_tmux_plugin_path/tmux.extra.conf"
else else
#use this when they don't have a ~/.tmux.conf #use this when they don't have a ~/.tmux.conf
fixed_config=$zsh_tmux_plugin_path/tmux.only.conf fixed_config="$zsh_tmux_plugin_path/tmux.only.conf"
fi fi
fi fi
# Override tmux with our function # Wrapper function for tmux.
function zsh_tmux_plugin_start() function zsh_tmux_plugin_run()
{ {
# We have other arguments, just run them # We have other arguments, just run them
if [[ ! -n "$@" ]] if [[ -n "$@" ]]
then then
\tmux $@ \tmux $@
# Try to connect to an existing session. # Try to connect to an existing session.
elif [[ "$ZSH_TMUX_AUTOCONNECT" == "true" ]] elif [[ "$ZSH_TMUX_AUTOCONNECT" == "true" ]]
then then
\tmux attach || tmux -f $fixed_config new-session \tmux attach || \tmux `[[ -n "$fixed_config" ]] && echo '-f ' $fixed_config` new-session
[[ "$ZSH_TMUX_AUTOQUIT" == "true" ]] && exit [[ "$ZSH_TMUX_AUTOQUIT" == "true" ]] && exit
# Just try to fix the TERM variable. # Just run tmux, fixing the TERM variable if requested.
else else
\tmux -f $fixed_config \tmux `[[ -n "$fixed_config" ]] && echo '-f ' $fixed_config`
[[ "$ZSH_TMUX_AUTOQUIT" == "true" ]] && exit [[ "$ZSH_TMUX_AUTOQUIT" == "true" ]] && exit
fi fi
} }
# Alias tmux to our wrapper function.
alias tmux=zsh_tmux_plugin_start alias tmux=zsh_tmux_plugin_start
if [[ "$ZSH_TMUX_AUTOSTART" == "true" ]] if [[ "$ZSH_TMUX_AUTOSTART" == "true" ]]
then then
zsh_tmux_plugin_start zsh_tmux_plugin_run
fi fi