Auto merge of #2118 - micbou:travis, r=Valloric

[READY] Fix and improve pyenv setup in Travis script

See PR Valloric/ycmd#459.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/valloric/youcompleteme/2118)
<!-- Reviewable:end -->
This commit is contained in:
Homu 2016-04-16 17:34:55 +09:00
commit f53b272801

View File

@ -15,16 +15,16 @@ source ci/travis/travis_install.${TRAVIS_OS_NAME}.sh
# pyenv setup # pyenv setup
############# #############
# DON'T exit if error export PYENV_ROOT="${HOME}/.pyenv"
set +e
git clone https://github.com/yyuu/pyenv.git ~/.pyenv
git fetch --tags
git checkout v20160202
# Exit if error
set -e
export PYENV_ROOT="$HOME/.pyenv" if [ ! -d "${PYENV_ROOT}" ]; then
export PATH="$PYENV_ROOT/bin:$PATH" git clone https://github.com/yyuu/pyenv.git ${PYENV_ROOT}
fi
pushd ${PYENV_ROOT}
git checkout v20160202
popd
export PATH="${PYENV_ROOT}/bin:${PATH}"
eval "$(pyenv init -)" eval "$(pyenv init -)"