Fixes and improvements

scripts/smoke-test.sh

@@ -15,7 +15,7 @@ monitor_curl() {
 
 # --fail-with-body was added in curl 7.76; older builds (e.g. CentOS 7 ships
 # 7.29) would abort with an unknown-option error, so fall back to --fail.
-if curl --help 2>&1 | grep -q -- '--fail-with-body'; then
+if curl --help all 2>&1 | grep -q -- '--fail-with-body'; then
   CURL_FAIL_FLAG=--fail-with-body
 else
   CURL_FAIL_FLAG=--fail