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

tmux: fix ineffective "local"

Browse Source
This commit is contained in:
Andrew Janke 2015-09-28 01:13:10 -04:00
parent 96f217457f
commit 671ec405f7
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,8 +39,6 @@ fi
[[ -n "$ZSH_TMUX_FIXTERM_WITH_256COLOR" ]] || ZSH_TMUX_FIXTERM_WITH_256COLOR="screen-256color" [[ -n "$ZSH_TMUX_FIXTERM_WITH_256COLOR" ]] || ZSH_TMUX_FIXTERM_WITH_256COLOR="screen-256color"
# Get the absolute path to the current directory
local zsh_tmux_plugin_path=${0:h}
# Determine if the terminal supports 256 colors # Determine if the terminal supports 256 colors
if [[ `tput colors` == "256" ]]; then if [[ `tput colors` == "256" ]]; then
@ -52,10 +50,10 @@ fi
# Set the correct local config file to use. # Set the correct local config file to use.
if [[ "$ZSH_TMUX_ITERM2" != "true" ]] && [[ -f $HOME/.tmux.conf || -h $HOME/.tmux.conf ]]; then if [[ "$ZSH_TMUX_ITERM2" != "true" ]] && [[ -f $HOME/.tmux.conf || -h $HOME/.tmux.conf ]]; then
#use this when they have a ~/.tmux.conf #use this when they have a ~/.tmux.conf
export _ZSH_TMUX_FIXED_CONFIG="$zsh_tmux_plugin_path/tmux.extra.conf" export _ZSH_TMUX_FIXED_CONFIG="${0:h}/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
export _ZSH_TMUX_FIXED_CONFIG="$zsh_tmux_plugin_path/tmux.only.conf" export _ZSH_TMUX_FIXED_CONFIG="${0:h}/tmux.only.conf"
fi fi
# Wrapper function for tmux. # Wrapper function for tmux.