Skip to content

O
oh-my-zsh
Commit 24d83d1e authored by Yuan-Hao Chen's avatar Yuan-Hao Chen Committed by Marc Cornellà
Browse files
Options

tmux: fix bad tmux config syntax and logical expression error in 86b39cfa (#8374)

parent 8b6b2ea0
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 4 deletions
plugins/tmux/tmux.extra.conf
View file @ 24d83d1e
set -g default-terminal $ZSH_TMUX_TERM set -g default-terminal $ZSH_TMUX_TERM
source $ZSH_TMUX_CONFIG source-file $ZSH_TMUX_CONFIG
\ No newline at end of file \ No newline at end of file
plugins/tmux/tmux.plugin.zsh
View file @ 24d83d1e
...@@ -67,9 +67,12 @@ function _zsh_tmux_plugin_run() { ...@@ -67,9 +67,12 @@ function _zsh_tmux_plugin_run() {
# If failed, just run tmux, fixing the TERM variable if requested. # If failed, just run tmux, fixing the TERM variable if requested.
if [[ $? -ne 0 ]]; then if [[ $? -ne 0 ]]; then
[[ "$ZSH_TMUX_FIXTERM" == "true" ]] && tmux_cmd+=(-f "$_ZSH_TMUX_FIXED_CONFIG") || \ if [[ "$ZSH_TMUX_FIXTERM" == "true" ]]; then
[[ -e "$ZSH_TMUX_CONFIG" ]] && tmux_cmd+=(-f "$ZSH_TMUX_CONFIG") tmux_cmd+=(-f "$_ZSH_TMUX_FIXED_CONFIG")
$tmux_cmd new-session elif [[ -e "$ZSH_TMUX_CONFIG" ]]; then
tmux_cmd+=(-f "$ZSH_TMUX_CONFIG")
fi
$tmux_cmd new-session
fi fi
if [[ "$ZSH_TMUX_AUTOQUIT" == "true" ]]; then if [[ "$ZSH_TMUX_AUTOQUIT" == "true" ]]; then
......
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