From 32509aef1fc336a25aad094aad7573fc1d736574 Mon Sep 17 00:00:00 2001
From: Alex Gaynor <alex.gaynor@gmail.com>
Date: Mon, 26 Sep 2016 10:16:01 -0400
Subject: Simplify OpenSSL bits in travis (#3172)

* Simplify OpenSSL bits in travis

* more simplify

* missed one
---
 .travis/install.sh | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

(limited to '.travis/install.sh')

diff --git a/.travis/install.sh b/.travis/install.sh
index ecacc147..d3a7358a 100755
--- a/.travis/install.sh
+++ b/.travis/install.sh
@@ -60,21 +60,14 @@ else
         pyenv global "pypy-$PYPY_VERSION"
     fi
 
-    if [[ "${OPENSSL}" == "1.0.0" ]]; then
-        OPENSSL_VERSION_NUMBER="1.0.0t"
-        OPENSSL_DIR="ossl-100t"
-    fi
-    if [[ "${OPENSSL}" == "1.1.0" ]]; then
-        OPENSSL_VERSION_NUMBER="1.1.0a"
-        OPENSSL_DIR="ossl-110a"
-    fi
     # download, compile, and install if it's not already present via travis
     # cache
-    if [ -n "$OPENSSL_DIR" ]; then
+    if [ -n "${OPENSSL}" ]; then
+        OPENSSL_DIR="ossl/${OPENSSL}"
         if [[ ! -f "$HOME/$OPENSSL_DIR/bin/openssl" ]]; then
-            curl -O https://www.openssl.org/source/openssl-$OPENSSL_VERSION_NUMBER.tar.gz
-            tar zxf openssl-$OPENSSL_VERSION_NUMBER.tar.gz
-            cd openssl-$OPENSSL_VERSION_NUMBER
+            curl -O https://www.openssl.org/source/openssl-$OPENSSL.tar.gz
+            tar zxf openssl-$OPENSSL.tar.gz
+            cd openssl-$OPENSSL
             ./config shared no-asm no-ssl2 -fPIC --prefix="$HOME/$OPENSSL_DIR"
             # modify the shlib version to a unique one to make sure the dynamic
             # linker doesn't load the system one. This isn't required for 1.1.0 at the
-- 
cgit v1.2.3