commit 64438573b1da9f8384b0fc05604e84e861402e68 parent 354c737ce0cee45574bed01f60fb9184358638d4 Author: Johann Bauer <bauerj@bauerj.eu> Date: Sun, 13 May 2018 22:14:48 +0200 Follow-up 354c737: Fix macOS build Diffstat:
| M | contrib/build-osx/make_osx | | | 16 | ++++++++-------- |
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/contrib/build-osx/make_osx b/contrib/build-osx/make_osx @@ -16,14 +16,14 @@ VERSION=`git describe --tags --dirty` info "Installing Python $PYTHON_VERSION" export PATH="~/.pyenv/bin:~/.pyenv/shims:~/Library/Python/3.6/bin:$PATH" -#if [ -d "~/.pyenv" ]; then -# pyenv update -#else -# curl -L https://raw.githubusercontent.com/pyenv/pyenv-installer/master/bin/pyenv-installer | bash > /dev/null 2>&1 -#fi -#PYTHON_CONFIGURE_OPTS="--enable-framework" pyenv install -s $PYTHON_VERSION && \ -#pyenv global $PYTHON_VERSION || \ -#fail "Unable to use Python $PYTHON_VERSION" +if [ -d "~/.pyenv" ]; then + pyenv update +else + curl -L https://raw.githubusercontent.com/pyenv/pyenv-installer/master/bin/pyenv-installer | bash > /dev/null 2>&1 +fi +PYTHON_CONFIGURE_OPTS="--enable-framework" pyenv install -s $PYTHON_VERSION && \ +pyenv global $PYTHON_VERSION || \ +fail "Unable to use Python $PYTHON_VERSION" info "Installing pyinstaller"