Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
adam.huang
Oh My Zsh
Commits
43c50f03
Commit
43c50f03
authored
Feb 26, 2013
by
Josh Matthews
Browse files
Checking environment instead of local variable for fixing term in tmux plugin.
parent
7b156278
Changes
1
Show whitespace changes
Inline
Side-by-side
plugins/tmux/tmux.plugin.zsh
View file @
43c50f03
...
@@ -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
\t
mux attach
||
\t
mux
`
[[
-n
"
$fixed_config
"
]]
&&
echo
'-f '
$fixed_config
`
new-session
\t
mux attach
||
\t
mux
`
[[
"
$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
\t
mux
`
[[
-n
"
$fixed_config
"
]]
&&
echo
'-f '
$fixed_config
`
\t
mux
`
[[
"
$ZSH_TMUX_FIXTERM
"
==
"true
"
]]
&&
echo
'-f '
$fixed_config
`
[[
"
$ZSH_TMUX_AUTOQUIT
"
==
"true"
]]
&&
exit
[[
"
$ZSH_TMUX_AUTOQUIT
"
==
"true"
]]
&&
exit
fi
fi
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment