mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2024-11-29 09:10:07 +00:00
Fixing typos, logic, and gremlins in tmux plugin.
This commit is contained in:
parent
bf40d4e354
commit
7b15627851
1 changed files with 14 additions and 13 deletions
|
@ -6,7 +6,7 @@
|
|||
# Automatically close the terminal when tmux exits
|
||||
[[ -n "$ZSH_TMUX_AUTOQUIT" ]] || ZSH_TMUX_AUTOQUIT=$ZSH_TMUX_AUTOSTART
|
||||
# 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
|
||||
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
|
||||
if [[ `tput colors` == "256" ]]
|
||||
then
|
||||
export $ZSH_TMUX_TERM="screen-256"
|
||||
export ZSH_TMUX_TERM="screen-256color"
|
||||
else
|
||||
export $ZSH_TMUX_TERM="screen"
|
||||
export ZSH_TMUX_TERM="screen"
|
||||
fi
|
||||
|
||||
# Local variable to store the local config file to use, if any.
|
||||
local fixed_config=""
|
||||
|
||||
# Set the correct local config file to use
|
||||
# Set the correct local config file to use.
|
||||
if [[ "$ZSH_TMUX_FIXTERM" == "true" ]]
|
||||
then
|
||||
if [[ -f $HOME/.tmux.conf || -h $HOME/.tmux.conf ]]
|
||||
then
|
||||
#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
|
||||
#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
|
||||
|
||||
# Override tmux with our function
|
||||
function zsh_tmux_plugin_start()
|
||||
# Wrapper function for tmux.
|
||||
function zsh_tmux_plugin_run()
|
||||
{
|
||||
# We have other arguments, just run them
|
||||
if [[ ! -n "$@" ]]
|
||||
if [[ -n "$@" ]]
|
||||
then
|
||||
\tmux $@
|
||||
# Try to connect to an existing session.
|
||||
elif [[ "$ZSH_TMUX_AUTOCONNECT" == "true" ]]
|
||||
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
|
||||
# Just try to fix the TERM variable.
|
||||
# Just run tmux, fixing the TERM variable if requested.
|
||||
else
|
||||
\tmux -f $fixed_config
|
||||
\tmux `[[ -n "$fixed_config" ]] && echo '-f ' $fixed_config`
|
||||
[[ "$ZSH_TMUX_AUTOQUIT" == "true" ]] && exit
|
||||
fi
|
||||
}
|
||||
|
||||
# Alias tmux to our wrapper function.
|
||||
alias tmux=zsh_tmux_plugin_start
|
||||
|
||||
if [[ "$ZSH_TMUX_AUTOSTART" == "true" ]]
|
||||
then
|
||||
zsh_tmux_plugin_start
|
||||
zsh_tmux_plugin_run
|
||||
fi
|
||||
|
|
Loading…
Reference in a new issue