"plugins/vscode:/vscode.git/clone" did not exist on "7f69551498a78a6b30d706c89808fcd2ba000045"
Commit 43c50f03 authored by Josh Matthews's avatar Josh Matthews
Browse files

Checking environment instead of local variable for fixing term in tmux plugin.

parent 7b156278
...@@ -23,16 +23,13 @@ fi ...@@ -23,16 +23,13 @@ fi
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 [[ -f $HOME/.tmux.conf || -h $HOME/.tmux.conf ]]
then then
if [[ -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
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
# Wrapper function for tmux. # Wrapper function for tmux.
...@@ -45,11 +42,11 @@ function zsh_tmux_plugin_run() ...@@ -45,11 +42,11 @@ function zsh_tmux_plugin_run()
# 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 `[[ -n "$fixed_config" ]] && echo '-f ' $fixed_config` new-session \tmux attach || \tmux `[[ "$ZSH_TMUX_FIXTERM" == "true" ]] && echo '-f '$fixed_config` new-session
[[ "$ZSH_TMUX_AUTOQUIT" == "true" ]] && exit [[ "$ZSH_TMUX_AUTOQUIT" == "true" ]] && exit
# Just run tmux, fixing the TERM variable if requested. # Just run tmux, fixing the TERM variable if requested.
else else
\tmux `[[ -n "$fixed_config" ]] && echo '-f ' $fixed_config` \tmux `[[ "$ZSH_TMUX_FIXTERM" == "true" ]] && echo '-f '$fixed_config`
[[ "$ZSH_TMUX_AUTOQUIT" == "true" ]] && exit [[ "$ZSH_TMUX_AUTOQUIT" == "true" ]] && exit
fi fi
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment