Merge branch 'master' into make-tmux-is-at-least-support-build-from-master

docwhat · web-flow · commit 14f588edbe8c · 2017-05-19T21:30:19.000-04:00
diff --git a/scripts/helpers.sh b/scripts/helpers.sh
@@ -131,7 +131,9 @@ clipboard_copy_command() {
     fi
 }
 
+# Cache the TMUX version for speed.
 tmux_version="$(tmux -V | cut -d ' ' -f 2)"
+
 tmux_is_at_least() {
     if [[ $tmux_version == "$1" || $tmux_version == "master" ]]
     then

Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,9 @@ clipboard_copy_command() {`
`131`	`131`	`fi`
`132`	`132`	`}`
`133`	`133`
	`134`	`+# Cache the TMUX version for speed.`
`134`	`135`	`tmux_version="$(tmux -V \| cut -d ' ' -f 2)"`
	`136`	`+`
`135`	`137`	`tmux_is_at_least() {`
`136`	`138`	`if [[ $tmux_version == "$1" \|\| $tmux_version == "master" ]]`
`137`	`139`	`then`