From 0af7f388d6e63e74920e5f0cc9ae21f717d223d1 Mon Sep 17 00:00:00 2001 From: Lukas Schauer Date: Sat, 16 Jan 2016 21:50:15 +0100 Subject: [PATCH] check exitcode of `curl -V` because of some issue with ancient versions of curl returning error codes on checking the version number --- letsencrypt.sh | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/letsencrypt.sh b/letsencrypt.sh index fa4e156..d276941 100755 --- a/letsencrypt.sh +++ b/letsencrypt.sh @@ -10,11 +10,20 @@ BASEDIR="${SCRIPTDIR}" # Check for script dependencies check_dependencies() { - curl -V > /dev/null 2>&1 || _exiterr "This script requires curl." + # just execute some dummy and/or version commands to see if required tools exist and are actually usable openssl version > /dev/null 2>&1 || _exiterr "This script requires an openssl binary." _sed "" < /dev/null > /dev/null 2>&1 || _exiterr "This script requires sed with support for extended (modern) regular expressions." grep -V > /dev/null 2>&1 || _exiterr "This script requires grep." mktemp -u -t XXXXXX > /dev/null 2>&1 || _exiterr "This script requires mktemp." + + # curl returns with an error code in some ancient versions so we have to catch that + set +e + curl -V > /dev/null 2>&1 + set -e + retcode="$?" + if [[ ! "${retcode}" = "0" ]] && [[ ! "${retcode}" = "2" ]]; then + _exiterr "This script requires curl." + fi } # Setup default config values, search for and load configuration files -- 2.47.3