Adjust fish version tests for bot-ci-compiled fish

This commit is contained in:
ZyX 2015-02-21 00:08:12 +03:00
parent 0a0af212ad
commit 75c5295a8c

View File

@ -315,24 +315,27 @@ for exe in bash zsh busybox fish tcsh mksh dash ipython ; do
fish_version="$(fish --version 2>&1)" fish_version="$(fish --version 2>&1)"
fish_version="${fish_version##* }" fish_version="${fish_version##* }"
fish_version_major="${fish_version%%.*}" fish_version_major="${fish_version%%.*}"
fish_version_minor="${fish_version#*.}" if test "$fish_version_major" != "$fish_version" ; then
fish_version_patch="${fish_version_minor#*.}" # No dot is in development version compiled by bot-ci
fish_version_dev="${fish_version_patch#*-}" fish_version_minor="${fish_version#*.}"
if test "$fish_version_dev" = "$fish_version_patch" ; then fish_version_patch="${fish_version_minor#*.}"
fish_version_dev="" fish_version_dev="${fish_version_patch#*-}"
fi if test "$fish_version_dev" = "$fish_version_patch" ; then
fish_version_minor="${fish_version_minor%%.*}" fish_version_dev=""
fish_version_patch="${fish_version_patch%%-*}" fi
if test $fish_version_major -lt 2 || ( \ fish_version_minor="${fish_version_minor%%.*}"
test $fish_version_major -eq 2 && (\ fish_version_patch="${fish_version_patch%%-*}"
test $fish_version_minor -lt 1 || (\ if test $fish_version_major -lt 2 || ( \
test $fish_version_minor -eq 1 && test $fish_version_major -eq 2 && (\
test $fish_version_patch -lt 2 && \ test $fish_version_minor -lt 1 || (\
test -z "$fish_version_dev" test $fish_version_minor -eq 1 &&
test $fish_version_patch -lt 2 && \
test -z "$fish_version_dev"
) \
) \ ) \
) \ ) ; then
) ; then continue
continue fi
fi fi
fi fi
ln -s "$(which $exe)" tests/shell/path ln -s "$(which $exe)" tests/shell/path