]> git.ipfire.org Git - thirdparty/dehydrated.git/commitdiff
use normal error behaviour for failing http requests (fixes #782)
authorLukas Schauer <lukas@schauer.so>
Thu, 10 Dec 2020 15:32:02 +0000 (16:32 +0100)
committerLukas Schauer <lukas@schauer.so>
Thu, 10 Dec 2020 15:32:26 +0000 (16:32 +0100)
dehydrated

index a45d7d29cf9fbe7a3174f7739247249264f7bc94..ed241678c39b62881fa2aed48d34ae03c533801d 100755 (executable)
@@ -731,7 +731,9 @@ _sed() {
 
 # Print error message and exit with error
 _exiterr() {
-  echo "ERROR: ${1}" >&2
+  if [ -n "${1:-}" ]; then
+    echo "ERROR: ${1}" >&2
+  fi
   [[ "${skip_exit_hook:-no}" = "no" ]] && [[ -n "${HOOK:-}" ]] && ("${HOOK}" "exit_hook" "${1}" || echo 'exit_hook returned with non-zero exit code!' >&2)
   exit 1
 }
@@ -844,7 +846,7 @@ http_request() {
 
       # remove temporary domains.txt file if used
       [[ "${COMMAND:-}" = "sign_domains" && -n "${PARAM_DOMAIN:-}" && -n "${DOMAINS_TXT:-}" ]] && rm "${DOMAINS_TXT}"
-      exit 1
+      _exiterr
     fi
   fi