From 7f3cc5b44082b084c2d96082bc5a24a0637204f2 Mon Sep 17 00:00:00 2001
From: srvrco <andy@serverco.com>
Date: Tue, 28 Aug 2018 15:30:57 +0100
Subject: [PATCH] merging in PR's for the new wildcard certs from LetsEncrypt
 (1.21)

---
 .travis.yml | 24 +++++++++---------------
 checkssl    |  3 ++-
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0acbee2..6f9f561 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,17 +1,11 @@
-language: bash
-
-# Use container-based infrastructure for quicker build start-up
-sudo: false
-
-addons:
-  apt:
-    sources:
-    - debian-sid    # Grab shellcheck from the Debian repo
-    packages:
-    - shellcheck
+#install:
+#
+#  # Install a custom version of shellcheck instead of Travis CI's default
+#  - scversion="stable" # or "v0.4.7", or "latest"
+#  - wget "https://storage.googleapis.com/shellcheck/shellcheck-$scversion.linux.x86_64.tar.xz"
+#  - tar --xz -xvf "shellcheck-$scversion.linux.x86_64.tar.xz"
+#  - shellcheck() { "shellcheck-$scversion/shellcheck" "$@"; }
+#  - shellcheck --version
 
 script:
- - bash -c 'shopt -s globstar; shellcheck checkssl'
-
-matrix:
-  fast_finish: true
+  - shellcheck $(grep -rl '"^#!/bin/sh\|^#!/bin/bash\|^#!/usr/bin/env bash' ./ | grep -v ".git\|travis.yml")
diff --git a/checkssl b/checkssl
index e228f0d..caab753 100755
--- a/checkssl
+++ b/checkssl
@@ -48,10 +48,11 @@
 # 2017-02-22 make no output when -u is only arg and no upgrade available (1.18)
 # 2017-12-09 Set LC_TIME to be able to parse english month (1.19)
 # 2017-12-09 Use absolute path to `date` binary (1.20)
+# 2018-08-28 merging in PR's for the new wildcard certs from LetsEncrypt (1.21)
 # ---------------------------------------------------------------------------
 
 PROGNAME=${0##*/}
-VERSION="1.20"
+VERSION="1.21"
 
 ORIGCMD="$0 $*"
 CODE_LOCATION="https://raw.githubusercontent.com/srvrco/checkssl/master/checkssl"