diff --git a/ci/travis/before_deploy.sh b/ci/travis/before_deploy.sh index a008227129f92baa8e672dde6cdd8e053b2647ba..f80fb656c0d199f73f5dc5acf48a68053a9c7eac 100755 --- a/ci/travis/before_deploy.sh +++ b/ci/travis/before_deploy.sh @@ -1,4 +1,9 @@ #!/usr/bin/env bash -[ $TRAVIS_OS_NAME == "osx" ] && zip -r sakia-${TRAVIS_OS_NAME}.zip build/*.dmg -[ $TRAVIS_OS_NAME == "linux" ] && zip -r sakia-${TRAVIS_OS_NAME}.zip build/exe* +if [ $TRAVIS_OS_NAME == "osx" ] +then + zip -r sakia-${TRAVIS_OS_NAME}.zip build/*.dmg +elif [ $TRAVIS_OS_NAME == "linux" ] +then + zip -r sakia-${TRAVIS_OS_NAME}.zip build/exe* +fi diff --git a/ci/travis/before_install.sh b/ci/travis/before_install.sh index 62c05d3f25ff5a42d73c678d2d10b399d9e28a3c..679c5c359219d24967e843e06b2d05d009335b17 100755 --- a/ci/travis/before_install.sh +++ b/ci/travis/before_install.sh @@ -28,8 +28,13 @@ pyenv activate sakia-env if [ $? -ne 0 ] then echo "Sakia env cache cleared, rebuilding it..." - [ $TRAVIS_OS_NAME == "osx" ] && env PYTHON_CONFIGURE_OPTS="--enable-framework" pyenv install $PYENV_PYTHON_VERSION - [ $TRAVIS_OS_NAME == "linux" ] && PYTHON_CONFIGURE_OPTS="--enable-shared" pyenv install $PYENV_PYTHON_VERSION + if [ $TRAVIS_OS_NAME == "osx" ] + then + env PYTHON_CONFIGURE_OPTS="--enable-framework" pyenv install $PYENV_PYTHON_VERSION + elif [ $TRAVIS_OS_NAME == "linux" ] + then + PYTHON_CONFIGURE_OPTS="--enable-shared" pyenv install $PYENV_PYTHON_VERSION + fi pyenv shell $PYENV_PYTHON_VERSION pyenv virtualenv sakia-env @@ -50,8 +55,13 @@ then tar xzf PyQt-gpl-5.5.1.tar.gz cd PyQt-gpl-5.5.1/ pyenv activate sakia-env - [ $TRAVIS_OS_NAME == "osx" ] && python configure.py --confirm-license - [ $TRAVIS_OS_NAME == "linux" ] && python configure.py --qmake "/usr/lib/x86_64-linux-gnu/qt5/bin/qmake" --confirm-license + if [ $TRAVIS_OS_NAME == "osx" ] + then + python configure.py --confirm-license + elif [ $TRAVIS_OS_NAME == "linux" ] + then + python configure.py --qmake "/usr/lib/x86_64-linux-gnu/qt5/bin/qmake" --confirm-license + fi make -j 2 && make install pyenv rehash diff --git a/ci/travis/build.sh b/ci/travis/build.sh index 05efb200dbf98609952c6db1da0d6b3f68f8ad5b..10e438e3b64ff4ddf1309c42c24a5e04ffbc296b 100755 --- a/ci/travis/build.sh +++ b/ci/travis/build.sh @@ -10,6 +10,11 @@ pip install -r requirements.txt python gen_resources.py python gen_translations.py -[ $TRAVIS_OS_NAME == "osx" ] && python setup.py bdist_dmg -[ $TRAVIS_OS_NAME == "linux" ] && python setup.py build +if [ $TRAVIS_OS_NAME == "osx" ] +then + python setup.py bdist_dmg +elif [ $TRAVIS_OS_NAME == "linux" ] +then + python setup.py build +fi