From 2adc885bb819375fa0a9a78ab08cdfbe78c8a9a1 Mon Sep 17 00:00:00 2001 From: Jim Myhrberg Date: Thu, 27 Apr 2017 17:21:01 +0100 Subject: [PATCH] Fix issue with using a tmux version compiled source Resolves #79. When tmux is compiled from source the version string is "master" which the tmux-version command didn't deal with correctly. --- libexec/tmuxifier-tmux-version | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/libexec/tmuxifier-tmux-version b/libexec/tmuxifier-tmux-version index f02a901..dac4aa7 100755 --- a/libexec/tmuxifier-tmux-version +++ b/libexec/tmuxifier-tmux-version @@ -44,7 +44,16 @@ vercomp () { version=$(tmux -V) version=${version/tmux /} -if [ -n "$1" ]; then +if [ -z "$1" ]; then + echo "$version" + exit +fi + +if [ "$version" == "master" ]; then + # When version string is "master", tmux was compiled from source, and we + # assume it's later than whatever the is. + echo '>' +else # Fix for "1.9a" version comparison, as vercomp() can only deal with # purely numeric version numbers. version=${version//+([a-zA-Z])/} @@ -55,6 +64,4 @@ if [ -n "$1" ]; then 1) echo '>';; 2) echo '<';; esac -else - echo "$version" fi