From: Lukas Schauer <lukas@schauer.so>
Date: Sat, 16 Jan 2016 20:50:15 +0000 (+0100)
Subject: check exitcode of `curl -V` because of some issue with ancient versions of curl retur... 
X-Git-Tag: v0.1.0~51
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0af7f388d6e63e74920e5f0cc9ae21f717d223d1;p=thirdparty%2Fdehydrated.git

check exitcode of `curl -V` because of some issue with ancient versions of curl returning error codes on checking the version number
---

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