From 489b16efce5249d172f965046f229cca4c836aa7 Mon Sep 17 00:00:00 2001 From: solarizedalias <60473183+solarizedalias@users.noreply.github.com> Date: Mon, 8 Mar 2021 12:44:36 +0900 Subject: [PATCH] [fzf-tmux] Adapt to tmux latest changes (#2379) --- bin/fzf-tmux | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/bin/fzf-tmux b/bin/fzf-tmux index 9d59994..8a9c2d5 100755 --- a/bin/fzf-tmux +++ b/bin/fzf-tmux @@ -204,7 +204,16 @@ if [[ "$opt" =~ "-K -E" ]]; then cat <<< "\"$fzf\" $opts < $fifo1 > $fifo2; out=\$? $close; exit \$out" >> $argsf cat <&0 > $fifo1 & fi - tmux popup -d "$PWD" "${tmux_args[@]}" $opt -R "bash $argsf" > /dev/null 2>&1 + + # tmux dropped the support for `-K`, `-R` to popup command + # TODO: We can remove this once tmux 3.2 is released + if [[ ! "$(tmux popup --help 2>&1)" =~ '-R shell-command' ]]; then + opt="${opt/-K/}" + else + opt="${opt} -R" + fi + + tmux popup -d "$PWD" "${tmux_args[@]}" $opt "bash $argsf" > /dev/null 2>&1 exit $? fi