linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-11-19 21:41:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

tmux: refactor

Browse source 
- Consolidates the switch-adding logic for readability.
- Replaces "[[ ... ]] && ..." with "if [[ ... ]]; then ..." in some
  cases to avoid a spurious nonzero exit status from _zsh_tmux_plugin_run.
- Puts error message on stderr instead of stdout
This commit is contained in:
Andrew Janke 2015-09-27 22:22:50 -04:00 committed by Marc Cornellà
parent f33691fbb6
commit 19716a8e3d
1 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
plugins/tmux/tmux.plugin.zsh
View file

@ -11,7 +11,7 @@ alias tkss='tmux kill-session -t'
# Only run if tmux is actually installed # Only run if tmux is actually installed
if ! which tmux &> /dev/null; then if ! which tmux &> /dev/null; then
print "zsh tmux plugin: tmux not found. Please install tmux before using this plugin." print "zsh tmux plugin: tmux not found. Please install tmux before using this plugin." >&2
return 1 return 1
fi fi
@ -40,9 +40,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="$(cd "$(dirname "$0")" && pwd)"
# Determine if the terminal supports 256 colors # Determine if the terminal supports 256 colors
if [[ `tput colors` == "256" ]]; then if [[ `tput colors` == "256" ]]; then
export ZSH_TMUX_TERM=$ZSH_TMUX_FIXTERM_WITH_256COLOR export ZSH_TMUX_TERM=$ZSH_TMUX_FIXTERM_WITH_256COLOR
@ -53,25 +50,33 @@ fi
# Set the correct local config file to use. # Set the correct local config file to use.
if [[ "$ZSH_TMUX_ITERM2" == "false" ]] && [[ -f $HOME/.tmux.conf || -h $HOME/.tmux.conf ]]; then if [[ "$ZSH_TMUX_ITERM2" == "false" ]] && [[ -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:a}/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:a}/tmux.only.conf"
fi fi
# Wrapper function for tmux. # Wrapper function for tmux.
function _zsh_tmux_plugin_run() { function _zsh_tmux_plugin_run() {
# We have other arguments, just run them local tmux_cmd
tmux_cmd=(command tmux)
[[ "$ZSH_TMUX_ITERM2" == "true" ]] && tmux_cmd+="-CC"
[[ "$ZSH_TMUX_FIXTERM" == "true" ]] && tmux_cmd+=(-f $_ZSH_TMUX_FIXED_CONFIG)
if [[ -n "$@" ]]; then if [[ -n "$@" ]]; then
# We have other arguments, just run them
\tmux $@ \tmux $@
# Try to connect to an existing session.
elif [[ "$ZSH_TMUX_AUTOCONNECT" == "true" ]]; then elif [[ "$ZSH_TMUX_AUTOCONNECT" == "true" ]]; then
\tmux `[[ "$ZSH_TMUX_ITERM2" == "true" ]] && echo '-CC '` attach || \tmux `[[ "$ZSH_TMUX_ITERM2" == "true" ]] && echo '-CC '` `[[ "$ZSH_TMUX_FIXTERM" == "true" ]] && echo '-f '$_ZSH_TMUX_FIXED_CONFIG` new-session # Try to connect to an existing session.
[[ "$ZSH_TMUX_AUTOQUIT" == "true" ]] && exit $tmux_cmd attach || $tmux_cmd new-session
# Just run tmux, fixing the TERM variable if requested. if [[ "$ZSH_TMUX_AUTOQUIT" == "true" ]]; then
exit
fi
else else
\tmux `[[ "$ZSH_TMUX_ITERM2" == "true" ]] && echo '-CC '` `[[ "$ZSH_TMUX_FIXTERM" == "true" ]] && echo '-f '$_ZSH_TMUX_FIXED_CONFIG` # Just run tmux, fixing the TERM variable if requested.
[[ "$ZSH_TMUX_AUTOQUIT" == "true" ]] && exit $tmux_cmd
if [[ "$ZSH_TMUX_AUTOQUIT" == "true" ]]; then
exit
fi
fi fi
} }