From 4441a6ff5953a2f2299331f060fa328787d92efd Mon Sep 17 00:00:00 2001
From: neilpang <github@byneil.com>
Date: Tue, 22 Nov 2016 21:59:40 +0800
Subject: [PATCH 01/25] support osx CI

---
 .travis.yml | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8829e472..77017f3e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,24 +1,30 @@
 language: shell
 sudo: required
 
+os:
+  - linux
+  - osx
+
 env:
   global:
     - SHFMT_URL=https://github.com/mvdan/sh/releases/download/v0.4.0/shfmt_v0.4.0_linux_amd64
 
 addons:
   apt:
-    sources:
-    - debian-sid    # Grab shellcheck from the Debian repo (o_O)
     packages:
     - shellcheck
 
+before_install:
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then brew update          ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install shellcheck; fi
+  
 script:
-  - curl -sSL $SHFMT_URL -o ~/shfmt
-  - chmod +x ~/shfmt
-  - ~/shfmt -l -w -i 2 .
-  - git diff --exit-code && echo "shfmt OK"
-  - shellcheck -V
-  - shellcheck -e SC2021,SC2126,SC2034 **/*.sh && echo "shellcheck OK"
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then curl -sSL $SHFMT_URL -o ~/shfmt ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; chmod +x ~/shfmt ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; ~/shfmt -l -w -i 2 . ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; git diff --exit-code && echo "shfmt OK" ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; shellcheck -V ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; shellcheck -e SC2021,SC2126,SC2034 **/*.sh && echo "shellcheck OK" ; fi
   - cd ..
   - git clone https://github.com/Neilpang/acmetest.git && cp -r acme.sh acmetest/ && cd acmetest
   - sudo ./letest.sh

From 791c62ca645ef65c0fc00735dd425aa5ba0ef416 Mon Sep 17 00:00:00 2001
From: neilpang <github@byneil.com>
Date: Tue, 22 Nov 2016 22:02:10 +0800
Subject: [PATCH 02/25] fix ci

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 77017f3e..2a319042 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,6 +11,8 @@ env:
 
 addons:
   apt:
+    sources:
+    - debian-sid    # Grab shellcheck from the Debian repo (o_O)
     packages:
     - shellcheck
 

From 1fadae82c79a1c7f52f1a1b03075459441f9fb96 Mon Sep 17 00:00:00 2001
From: neilpang <github@byneil.com>
Date: Tue, 22 Nov 2016 22:03:59 +0800
Subject: [PATCH 03/25] fix ci

---
 .travis.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2a319042..5c388ba9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,12 +21,12 @@ before_install:
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install shellcheck; fi
   
 script:
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then curl -sSL $SHFMT_URL -o ~/shfmt ; fi
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; chmod +x ~/shfmt ; fi
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; ~/shfmt -l -w -i 2 . ; fi
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; git diff --exit-code && echo "shfmt OK" ; fi
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; shellcheck -V ; fi
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; shellcheck -e SC2021,SC2126,SC2034 **/*.sh && echo "shellcheck OK" ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then then curl -sSL $SHFMT_URL -o ~/shfmt ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then chmod +x ~/shfmt ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ~/shfmt -l -w -i 2 . ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then git diff --exit-code && echo "shfmt OK" ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then shellcheck -V ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then shellcheck -e SC2021,SC2126,SC2034 **/*.sh && echo "shellcheck OK" ; fi
   - cd ..
   - git clone https://github.com/Neilpang/acmetest.git && cp -r acme.sh acmetest/ && cd acmetest
   - sudo ./letest.sh

From bc18168662a34397a5ee45bbd57d70beb1c36434 Mon Sep 17 00:00:00 2001
From: neilpang <github@byneil.com>
Date: Tue, 22 Nov 2016 22:06:19 +0800
Subject: [PATCH 04/25] fix ci

---
 .travis.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5c388ba9..90373171 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,9 +16,9 @@ addons:
     packages:
     - shellcheck
 
-before_install:
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then brew update          ; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install shellcheck; fi
+#before_install:
+#  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update          ; fi
+#  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install shellcheck; fi
   
 script:
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then then curl -sSL $SHFMT_URL -o ~/shfmt ; fi

From 41d804719f905bb7eaf7ee1cc6b748f9f92f126d Mon Sep 17 00:00:00 2001
From: neilpang <github@byneil.com>
Date: Tue, 22 Nov 2016 22:10:29 +0800
Subject: [PATCH 05/25] fix ci

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 90373171..ed54fd6e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,7 +21,7 @@ addons:
 #  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install shellcheck; fi
   
 script:
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then then curl -sSL $SHFMT_URL -o ~/shfmt ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then curl -sSL $SHFMT_URL -o ~/shfmt ; fi
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then chmod +x ~/shfmt ; fi
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ~/shfmt -l -w -i 2 . ; fi
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then git diff --exit-code && echo "shfmt OK" ; fi

From 28688488ff6c5841384bbe109b53c8fc4c734c20 Mon Sep 17 00:00:00 2001
From: neilpang <github@byneil.com>
Date: Tue, 22 Nov 2016 22:21:51 +0800
Subject: [PATCH 06/25] fix ci

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index ed54fd6e..53f21b37 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,6 +21,8 @@ addons:
 #  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install shellcheck; fi
   
 script:
+  - echo "TEST_LOCAL=$TEST_LOCAL"
+  - echo "NGROK_TOKEN=$(echo "$NGROK_TOKEN" | wc -c)"
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then curl -sSL $SHFMT_URL -o ~/shfmt ; fi
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then chmod +x ~/shfmt ; fi
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ~/shfmt -l -w -i 2 . ; fi

From 9eeae9ad7ea80dcb0e1f0d28e21b37c30891d0c9 Mon Sep 17 00:00:00 2001
From: neilpang <github@byneil.com>
Date: Tue, 22 Nov 2016 22:28:29 +0800
Subject: [PATCH 07/25] fix ch

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 53f21b37..8e00e251 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,7 +31,7 @@ script:
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then shellcheck -e SC2021,SC2126,SC2034 **/*.sh && echo "shellcheck OK" ; fi
   - cd ..
   - git clone https://github.com/Neilpang/acmetest.git && cp -r acme.sh acmetest/ && cd acmetest
-  - sudo ./letest.sh
+  - sudo NGROK_TOKEN="$NGROK_TOKEN" ./letest.sh
 
 
 matrix:

From fa6234e417297108008c6af06f89ba88d4b3be23 Mon Sep 17 00:00:00 2001
From: neilpang <github@byneil.com>
Date: Tue, 22 Nov 2016 22:37:48 +0800
Subject: [PATCH 08/25] add NGROK_TOKEN_OSX

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 8e00e251..e2b0a9d2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,7 +31,8 @@ script:
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then shellcheck -e SC2021,SC2126,SC2034 **/*.sh && echo "shellcheck OK" ; fi
   - cd ..
   - git clone https://github.com/Neilpang/acmetest.git && cp -r acme.sh acmetest/ && cd acmetest
-  - sudo NGROK_TOKEN="$NGROK_TOKEN" ./letest.sh
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo NGROK_TOKEN="$NGROK_TOKEN" ./letest.sh ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then sudo NGROK_TOKEN="$NGROK_TOKEN_OSX" ./letest.sh ; fi
 
 
 matrix:

From cfbb3e86b39db37fafec005fbbb6acb53949edc9 Mon Sep 17 00:00:00 2001
From: neilpang <github@byneil.com>
Date: Tue, 22 Nov 2016 22:52:08 +0800
Subject: [PATCH 09/25] fix ci

---
 .travis.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e2b0a9d2..84184d1d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,13 +16,14 @@ addons:
     packages:
     - shellcheck
 
-#before_install:
-#  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update          ; fi
-#  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install shellcheck; fi
+before_install:
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update          ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install openssl ; fi
   
 script:
   - echo "TEST_LOCAL=$TEST_LOCAL"
   - echo "NGROK_TOKEN=$(echo "$NGROK_TOKEN" | wc -c)"
+  - openssl version
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then curl -sSL $SHFMT_URL -o ~/shfmt ; fi
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then chmod +x ~/shfmt ; fi
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ~/shfmt -l -w -i 2 . ; fi

From d78c1f695e6f08a705b00f6e3349dc748f8d3a6c Mon Sep 17 00:00:00 2001
From: neilpang <github@byneil.com>
Date: Tue, 22 Nov 2016 23:10:41 +0800
Subject: [PATCH 10/25] fix ci

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 84184d1d..1482d2cc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,6 +19,7 @@ addons:
 before_install:
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update          ; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install openssl ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export PATH=/usr/local/bin:$PATH ; fi
   
 script:
   - echo "TEST_LOCAL=$TEST_LOCAL"

From e55b2f4f8de195bb86314f6b3f21b92ee11f3fa6 Mon Sep 17 00:00:00 2001
From: neil <github@byneil.com>
Date: Wed, 23 Nov 2016 13:18:29 +0800
Subject: [PATCH 11/25] fix ci

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 1482d2cc..1d97bdb4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,7 +19,7 @@ addons:
 before_install:
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update          ; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install openssl ; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export PATH=/usr/local/bin:$PATH ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew link openssl --force ; fi
   
 script:
   - echo "TEST_LOCAL=$TEST_LOCAL"

From 11e0ccdc91bc4077f46f057ef4eaf48c4ebfe672 Mon Sep 17 00:00:00 2001
From: neil <github@byneil.com>
Date: Wed, 23 Nov 2016 13:35:30 +0800
Subject: [PATCH 12/25] fix ci

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 1d97bdb4..122474df 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,6 +20,7 @@ before_install:
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update          ; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install openssl ; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew link openssl --force ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export openssl="/usr/local/bin/openssl" ; fi
   
 script:
   - echo "TEST_LOCAL=$TEST_LOCAL"

From 7fe19a030a84780e301f3b71d9f50c34928a2e57 Mon Sep 17 00:00:00 2001
From: neil <github@byneil.com>
Date: Wed, 23 Nov 2016 13:39:27 +0800
Subject: [PATCH 13/25] fix osx ci

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 122474df..7294a28f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,7 +20,7 @@ before_install:
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update          ; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install openssl ; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew link openssl --force ; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export openssl="/usr/local/bin/openssl" ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export OPENSSL_BIN="/usr/local/bin/openssl" ; fi
   
 script:
   - echo "TEST_LOCAL=$TEST_LOCAL"
@@ -35,7 +35,7 @@ script:
   - cd ..
   - git clone https://github.com/Neilpang/acmetest.git && cp -r acme.sh acmetest/ && cd acmetest
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo NGROK_TOKEN="$NGROK_TOKEN" ./letest.sh ; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then sudo NGROK_TOKEN="$NGROK_TOKEN_OSX" ./letest.sh ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then sudo NGROK_TOKEN="$NGROK_TOKEN_OSX" OPENSSL_BIN="/usr/local/bin/openssl" ./letest.sh ; fi
 
 
 matrix:

From 340155e6a6bd7dc1d97d586f56f2a8dd101edfe6 Mon Sep 17 00:00:00 2001
From: neil <github@byneil.com>
Date: Wed, 23 Nov 2016 13:51:01 +0800
Subject: [PATCH 14/25] fix ci

---
 .travis.yml | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7294a28f..f4b52227 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,15 +17,14 @@ addons:
     - shellcheck
 
 before_install:
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update          ; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install openssl ; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew link openssl --force ; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export OPENSSL_BIN="/usr/local/bin/openssl" ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then 
+      brew update && brew install openssl && brew link openssl --force
+    fi
   
 script:
   - echo "TEST_LOCAL=$TEST_LOCAL"
   - echo "NGROK_TOKEN=$(echo "$NGROK_TOKEN" | wc -c)"
-  - openssl version
+  - which openssl && openssl version
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then curl -sSL $SHFMT_URL -o ~/shfmt ; fi
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then chmod +x ~/shfmt ; fi
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ~/shfmt -l -w -i 2 . ; fi
@@ -35,7 +34,7 @@ script:
   - cd ..
   - git clone https://github.com/Neilpang/acmetest.git && cp -r acme.sh acmetest/ && cd acmetest
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo NGROK_TOKEN="$NGROK_TOKEN" ./letest.sh ; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then sudo NGROK_TOKEN="$NGROK_TOKEN_OSX" OPENSSL_BIN="/usr/local/bin/openssl" ./letest.sh ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then sudo NGROK_TOKEN="$NGROK_TOKEN_OSX" ./letest.sh ; fi
 
 
 matrix:

From 8dee328eae514bb55a1a373f17fd9f0bd11e982f Mon Sep 17 00:00:00 2001
From: neil <github@byneil.com>
Date: Wed, 23 Nov 2016 13:53:44 +0800
Subject: [PATCH 15/25] fix ci

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index f4b52227..1d61cc1f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,7 +18,7 @@ addons:
 
 before_install:
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then 
-      brew update && brew install openssl && brew link openssl --force
+      brew update && brew install openssl && brew link openssl --force;
     fi
   
 script:

From fa6e1746514bd23e57bfe5287cb363edad3abbfc Mon Sep 17 00:00:00 2001
From: neil <github@byneil.com>
Date: Wed, 23 Nov 2016 13:59:15 +0800
Subject: [PATCH 16/25] fix ci

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 1d61cc1f..7afbc90d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,7 @@ addons:
     packages:
     - shellcheck
 
-before_install:
+install:
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then 
       brew update && brew install openssl && brew link openssl --force;
     fi

From 8a09dc1b9be9b252660a7b7f3781e0ce4b17fe37 Mon Sep 17 00:00:00 2001
From: neil <github@byneil.com>
Date: Wed, 23 Nov 2016 18:50:34 +0800
Subject: [PATCH 17/25] fix ci

---
 .travis.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 7afbc90d..e3063963 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,6 +19,10 @@ addons:
 install:
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then 
       brew update && brew install openssl && brew link openssl --force;
+      #we must reload PATH to make the new openssl live
+      _old_path="$PATH";
+      export PATH=;
+      export PATH="$_old_path";
     fi
   
 script:

From 7cbe31baad614d5098e58e5f036955a60bd0d527 Mon Sep 17 00:00:00 2001
From: neil <github@byneil.com>
Date: Wed, 23 Nov 2016 18:51:49 +0800
Subject: [PATCH 18/25] fix ci

---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index e3063963..811e59c5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,7 +19,6 @@ addons:
 install:
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then 
       brew update && brew install openssl && brew link openssl --force;
-      #we must reload PATH to make the new openssl live
       _old_path="$PATH";
       export PATH=;
       export PATH="$_old_path";

From 10a6aec9982cc9326012f3de415410c51f1be93a Mon Sep 17 00:00:00 2001
From: neilpang <github@byneil.com>
Date: Wed, 23 Nov 2016 19:48:14 +0800
Subject: [PATCH 19/25] fix ci

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 811e59c5..38fb496a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,7 +20,8 @@ install:
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then 
       brew update && brew install openssl && brew link openssl --force;
       _old_path="$PATH";
-      export PATH=;
+      export PATH="";
+      openssl version 2>&1 || true
       export PATH="$_old_path";
     fi
   

From 2ffab66d97ff6e5a0f7c23e1c6565d7acc923b07 Mon Sep 17 00:00:00 2001
From: neilpang <github@byneil.com>
Date: Wed, 23 Nov 2016 20:01:40 +0800
Subject: [PATCH 20/25] fix ci

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 38fb496a..5cadb562 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,7 +21,7 @@ install:
       brew update && brew install openssl && brew link openssl --force;
       _old_path="$PATH";
       export PATH="";
-      openssl version 2>&1 || true
+      openssl version 2>&1 || true;
       export PATH="$_old_path";
     fi
   

From a205762bf092e107f5f00f2831be4a17dcef5006 Mon Sep 17 00:00:00 2001
From: neilpang <github@byneil.com>
Date: Wed, 23 Nov 2016 20:21:43 +0800
Subject: [PATCH 21/25] fix ci

---
 .travis.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 5cadb562..27847a19 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,7 +18,11 @@ addons:
 
 install:
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then 
-      brew update && brew install openssl && brew link openssl --force;
+      brew update && brew install openssl;
+      brew info openssl;
+      ln -s /usr/local/opt/openssl/lib/libcrypto.1.0.0.dylib /usr/local/lib/;
+      ln -s /usr/local/opt/openssl/lib/libssl.1.0.0.dylib /usr/local/lib/;
+      ln -s /usr/local/Cellar/openssl/1.0.2j/bin/openssl openssl;
       _old_path="$PATH";
       export PATH="";
       openssl version 2>&1 || true;

From 670cb9d223ace2baa0e73391873fc1fd1f24d52e Mon Sep 17 00:00:00 2001
From: neilpang <github@byneil.com>
Date: Wed, 23 Nov 2016 20:35:47 +0800
Subject: [PATCH 22/25] fix ci

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 27847a19..40a2019f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,8 +22,9 @@ install:
       brew info openssl;
       ln -s /usr/local/opt/openssl/lib/libcrypto.1.0.0.dylib /usr/local/lib/;
       ln -s /usr/local/opt/openssl/lib/libssl.1.0.0.dylib /usr/local/lib/;
-      ln -s /usr/local/Cellar/openssl/1.0.2j/bin/openssl openssl;
+      ln -s /usr/local/Cellar/openssl/1.0.2j/bin/openssl /usr/local/openssl;
       _old_path="$PATH";
+      echo "PATH=$PATH"
       export PATH="";
       openssl version 2>&1 || true;
       export PATH="$_old_path";

From d2aa3318388f7ed7900ea08845dbbc2c9beed395 Mon Sep 17 00:00:00 2001
From: neilpang <github@byneil.com>
Date: Wed, 23 Nov 2016 20:46:11 +0800
Subject: [PATCH 23/25] fix ci

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 40a2019f..8659ecd1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,7 +26,7 @@ install:
       _old_path="$PATH";
       echo "PATH=$PATH"
       export PATH="";
-      openssl version 2>&1 || true;
+      /usr/local/openssl version 2>&1 || true;
       export PATH="$_old_path";
     fi
   
@@ -43,7 +43,7 @@ script:
   - cd ..
   - git clone https://github.com/Neilpang/acmetest.git && cp -r acme.sh acmetest/ && cd acmetest
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo NGROK_TOKEN="$NGROK_TOKEN" ./letest.sh ; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then sudo NGROK_TOKEN="$NGROK_TOKEN_OSX" ./letest.sh ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then sudo NGROK_TOKEN="$NGROK_TOKEN_OSX" OPENSSL_BIN="/usr/local/Cellar/openssl/1.0.2j/bin/openssl" ./letest.sh ; fi
 
 
 matrix:

From 41266f05e93ff945526ef336a67c921c2d2b3dfe Mon Sep 17 00:00:00 2001
From: neilpang <github@byneil.com>
Date: Wed, 23 Nov 2016 21:01:47 +0800
Subject: [PATCH 24/25] fix CI

---
 .travis.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8659ecd1..645032a3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,7 +26,8 @@ install:
       _old_path="$PATH";
       echo "PATH=$PATH"
       export PATH="";
-      /usr/local/openssl version 2>&1 || true;
+      export OPENSSL_BIN="/usr/local/openssl"
+      $OPENSSL_BIN version 2>&1 || true;
       export PATH="$_old_path";
     fi
   
@@ -43,7 +44,7 @@ script:
   - cd ..
   - git clone https://github.com/Neilpang/acmetest.git && cp -r acme.sh acmetest/ && cd acmetest
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo NGROK_TOKEN="$NGROK_TOKEN" ./letest.sh ; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then sudo NGROK_TOKEN="$NGROK_TOKEN_OSX" OPENSSL_BIN="/usr/local/Cellar/openssl/1.0.2j/bin/openssl" ./letest.sh ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then sudo NGROK_TOKEN="$NGROK_TOKEN_OSX" OPENSSL_BIN="$OPENSSL_BIN" ./letest.sh ; fi
 
 
 matrix:

From df86ff2191d01f34d32f5b3f593033836186b021 Mon Sep 17 00:00:00 2001
From: neilpang <github@byneil.com>
Date: Wed, 23 Nov 2016 21:17:51 +0800
Subject: [PATCH 25/25] fix ci

---
 .travis.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 645032a3..7e901528 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,9 +24,10 @@ install:
       ln -s /usr/local/opt/openssl/lib/libssl.1.0.0.dylib /usr/local/lib/;
       ln -s /usr/local/Cellar/openssl/1.0.2j/bin/openssl /usr/local/openssl;
       _old_path="$PATH";
-      echo "PATH=$PATH"
+      echo "PATH=$PATH";
       export PATH="";
-      export OPENSSL_BIN="/usr/local/openssl"
+      export OPENSSL_BIN="/usr/local/openssl";
+      openssl version 2>&1 || true;
       $OPENSSL_BIN version 2>&1 || true;
       export PATH="$_old_path";
     fi