Updated tmux has different options

diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
index 2ce6caed0a993660c1789013700b6e191e0fa530..20bec23cc06dda0f4b45b6f50ee8d3d964d0d04d 100644 (file)
--- a/tmux/.tmux.conf
+++ b/tmux/.tmux.conf
@@ -38,7 +38,7 @@ bind-key u {
     capture-pane -J
     save-buffer /tmp/tmux-buffer
     delete-buffer
-    display-popup -KE -w 100% -R "urlview /tmp/tmux-buffer"
+    display-popup -E -w 100% "urlview /tmp/tmux-buffer"
 }
 
 bind-key y {
@@ -56,16 +56,16 @@ bind-key Y {
 }
 
 bind-key t display-menu \
-    music t "display-popup -KE -w 100% -R ~/bin/tmux-menu-music.sh" \
-    pass p "display-popup -KE -R ~/bin/tmux-menu-pass-session.sh" \
-    dict d "display-popup -KE -h 100% -R ~/bin/tmux-menu-dict.sh" \
-    calc c "display-popup -KE -R ~/bin/tmux-menu-calc.sh" \
-    cal l "display-popup -R \"cal -3N\"" \
-    top o "display-popup -KE -h 100% -R \"top -s 1\""
+    music t "display-popup -E -w 100% '~/bin/tmux-menu-music.sh'" \
+    pass p "display-popup -E '~/bin/tmux-menu-pass-session.sh'" \
+    dict d "display-popup -E -h 100% '~/bin/tmux-menu-dict.sh'" \
+    calc c "display-popup -E '~/bin/tmux-menu-calc.sh'" \
+    cal l "display-popup 'cal -3N'" \
+    top o "display-popup -E -h 100% 'top -s 1'"
 
 bind-key o display-menu \
-    find o "display-popup -KE -w 100% -R \"~/bin/tmux-fzf.zsh find '#{pane_current_path}'\"" \
-    buf-files f "display-popup -KE -w 100% -R \"~/bin/tmux-fzf.zsh buf-files '#{pane_current_path}'\"" \
-    git-files g "display-popup -KE -w 100% -R \"~/bin/tmux-fzf.zsh git-files '#{pane_current_path}'\"" \
-    git-branches b "display-popup -KE -w 100% -R \"~/bin/tmux-fzf.zsh git-branches '#{pane_current_path}'\"" \
-    git-commits c "display-popup -KE -w 100% -R \"~/bin/tmux-fzf.zsh git-commits '#{pane_current_path}'\""
+    find o "display-popup -E -w 100% \"~/bin/tmux-fzf.zsh find '#{pane_current_path}'\"" \
+    buf-files f "display-popup -E -w 100% \"~/bin/tmux-fzf.zsh buf-files '#{pane_current_path}'\"" \
+    git-files g "display-popup -E -w 100% \"~/bin/tmux-fzf.zsh git-files '#{pane_current_path}'\"" \
+    git-branches b "display-popup -E -w 100% \"~/bin/tmux-fzf.zsh git-branches '#{pane_current_path}'\"" \
+    git-commits c "display-popup -E -w 100% \"~/bin/tmux-fzf.zsh git-commits '#{pane_current_path}'\""

diff --git a/tmux/bin/tmux-common.sh b/tmux/bin/tmux-common.sh
index 35de25591b45c19242c1adaca0c748804ed4f046..49936a822008c898d3d520f7f001a5ce539bde1c 100644 (file)
--- a/tmux/bin/tmux-common.sh
+++ b/tmux/bin/tmux-common.sh
@@ -1,11 +1,9 @@
-TMUX=/usr/local/bin/tmux
-
 paste()
 {
     local pane="$1"
     local cmd="$2"
-    $TMUX set-buffer "$cmd"
-    $TMUX paste-buffer -t "$pane"
-    $TMUX delete-buffer
-    $TMUX send-keys -t "$pane" Enter
+    tmux set-buffer "$cmd"
+    tmux paste-buffer -t "$pane"
+    tmux delete-buffer
+    tmux send-keys -t "$pane" Enter
 }

diff --git a/x/bin/start-im b/x/bin/start-im
index 73de2a772ca396a515b70b065febf639fd0a2fa1..3b883d82a1e5a4d722263988ccb8b1f831095424 100755 (executable)
--- a/x/bin/start-im
+++ b/x/bin/start-im
@@ -2,14 +2,14 @@
 
 . ~/bin/tmux-common.sh
 
-$TMUX has-session -t im && exit
-$TMUX new-session -d -s im
-$TMUX rename-window -t im:1 "mattermost"
-$TMUX split-window -t im:1
+tmux has-session -t im && exit
+tmux new-session -d -s im
+tmux rename-window -t im:1 "mattermost"
+tmux split-window -t im:1
 
 paste im:1.0 "~/work/matterircd/start.sh"
 sleep 1
 paste im:1.1 "irssi"
-$TMUX resize-pane -U -t im:1 15
+tmux resize-pane -U -t im:1 15
 
-CMD="$TMUX attach-session -t im" CMDTITLE="Terminal8" ~/bin/dwm-term &
+CMD="tmux attach-session -t im" CMDTITLE="Terminal8" ~/bin/dwm-term &