aboutsummaryrefslogtreecommitdiffstats
path: root/.travis/install.sh
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2014-10-15 10:52:10 -0700
committerAlex Gaynor <alex.gaynor@gmail.com>2014-10-15 10:52:10 -0700
commit41fbdd3018127395fe18b9e9e7ce4c6a86d7aed8 (patch)
tree4e90959aaaf742ee228f1f38f798655ca5c649df /.travis/install.sh
parentcb6c4c1f4c1659d23ca9f4b3e92923ee9f017520 (diff)
downloadcryptography-41fbdd3018127395fe18b9e9e7ce4c6a86d7aed8.tar.gz
cryptography-41fbdd3018127395fe18b9e9e7ce4c6a86d7aed8.tar.bz2
cryptography-41fbdd3018127395fe18b9e9e7ce4c6a86d7aed8.zip
upgrade openssl to 1.0.1j on travis
Diffstat (limited to '.travis/install.sh')
-rwxr-xr-x.travis/install.sh12
1 files changed, 6 insertions, 6 deletions
diff --git a/.travis/install.sh b/.travis/install.sh
index 0c64ba93..01affab4 100755
--- a/.travis/install.sh
+++ b/.travis/install.sh
@@ -10,16 +10,16 @@ else
fi
if [[ "${OPENSSL}" == "0.9.8" ]]; then
- 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
+ if [[ "$DARWIN" = false ]]; 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
fi
+else
+ if [[ "$DARWIN" = true ]]; then
+ brew update
+ brew upgrade openssl
+ fi
fi
if [[ "${TOX_ENV}" == "docs" ]]; then