diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-06-06 10:06:47 -0500 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-06-06 10:06:47 -0500 |
| commit | f1de2f78cfd2b19eb4e2485ff36008581b088292 (patch) | |
| tree | f8f4ef267e9cbf90f6e26e33d002148037f8efde | |
| parent | a7abb4bec5a06f2d1d6cd896b2f362cd79c4d5a3 (diff) | |
| parent | d1e43838d324a87425201065e0ecbcb8da87d8e1 (diff) | |
| download | cryptography-f1de2f78cfd2b19eb4e2485ff36008581b088292.tar.gz cryptography-f1de2f78cfd2b19eb4e2485ff36008581b088292.tar.bz2 cryptography-f1de2f78cfd2b19eb4e2485ff36008581b088292.zip | |
Merge pull request #1099 from daenney/if-darwin
travis: Set variable for Darwin and check that.
| -rwxr-xr-x | .travis/install.sh | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/.travis/install.sh b/.travis/install.sh index e028033e..3582ea12 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -3,21 +3,27 @@ set -e set -x +if [[ "$(uname -s)" == 'Darwin' ]]; then + DARWIN=true +else + DARWIN=false +fi + if [[ "${OPENSSL}" == "0.9.8" ]]; then - if [[ "$(uname -s)" != "Darwin" ]]; then - sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu/ lucid main" - sudo apt-get -y update - sudo apt-get install -y --force-yes libssl-dev/lucid - else + if [[ "$DARWIN" = true ]]; then # travis has openssl installed via brew already, but let's be sure if [[ "$(brew list | grep openssl)" != "openssl" ]]; then brew install openssl fi + else + sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu/ lucid main" + sudo apt-get -y update + sudo apt-get install -y --force-yes libssl-dev/lucid fi fi if [[ "${TOX_ENV}" == "docs" ]]; then - if [[ "$(uname -s)" == "Darwin" ]]; then + if [[ "$DARWIN" = true ]]; then brew update brew install enchant else @@ -26,7 +32,7 @@ if [[ "${TOX_ENV}" == "docs" ]]; then fi fi -if [[ "$(uname -s)" == "Darwin" ]]; then +if [[ "$DARWIN" = true ]]; then brew update brew install pyenv if which pyenv > /dev/null; then eval "$(pyenv init -)"; fi @@ -102,6 +108,6 @@ virtualenv ~/.venv source ~/.venv/bin/activate pip install tox coveralls -if [[ "$(uname -s)" == "Darwin" ]]; then +if [[ "$DARWIN" = true ]]; then pyenv rehash fi |