Browse Source

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

Yuan-Hao Chen 4 years ago
parent
commit
24d83d1e8c
2 changed files with 7 additions and 4 deletions
  1. 1 1
      plugins/tmux/tmux.extra.conf
  2. 6 3
      plugins/tmux/tmux.plugin.zsh

+ 1 - 1
plugins/tmux/tmux.extra.conf

@@ -1,2 +1,2 @@
 set -g default-terminal $ZSH_TMUX_TERM
-source $ZSH_TMUX_CONFIG
+source-file $ZSH_TMUX_CONFIG

+ 6 - 3
plugins/tmux/tmux.plugin.zsh

@@ -67,9 +67,12 @@ function _zsh_tmux_plugin_run() {
 
   # If failed, just run tmux, fixing the TERM variable if requested.
   if [[ $? -ne 0 ]]; then
-    [[ "$ZSH_TMUX_FIXTERM" == "true" ]] && tmux_cmd+=(-f "$_ZSH_TMUX_FIXED_CONFIG") || \
-    [[ -e "$ZSH_TMUX_CONFIG" ]] && tmux_cmd+=(-f "$ZSH_TMUX_CONFIG")
-    $tmux_cmd new-session  
+    if [[ "$ZSH_TMUX_FIXTERM" == "true" ]]; then
+      tmux_cmd+=(-f "$_ZSH_TMUX_FIXED_CONFIG")
+    elif [[ -e "$ZSH_TMUX_CONFIG" ]]; then
+      tmux_cmd+=(-f "$ZSH_TMUX_CONFIG")
+    fi
+    $tmux_cmd new-session
   fi
 
   if [[ "$ZSH_TMUX_AUTOQUIT" == "true" ]]; then