瀏覽代碼

improve `wget --content-on-error` condition

PMExtra 2 年之前
父節點
當前提交
057c95bd1c
共有 1 個文件被更改,包括 4 次插入4 次删除
  1. 4 4
      acme.sh

+ 4 - 4
acme.sh

@@ -1877,11 +1877,11 @@ _inithttp() {
     elif [ "$CA_BUNDLE" ]; then
     elif [ "$CA_BUNDLE" ]; then
       _ACME_WGET="$_ACME_WGET --ca-certificate=$CA_BUNDLE "
       _ACME_WGET="$_ACME_WGET --ca-certificate=$CA_BUNDLE "
     fi
     fi
-  fi
 
 
-  #from wget 1.14: do not skip body on 404 error
-  if [ "$_ACME_WGET" ] && _contains "$($_ACME_WGET --help 2>&1)" "--content-on-error"; then
-    _ACME_WGET="$_ACME_WGET --content-on-error "
+    #from wget 1.14: do not skip body on 404 error
+    if _contains "$(wget --help 2>&1)" "--content-on-error"; then
+      _ACME_WGET="$_ACME_WGET --content-on-error "
+    fi
   fi
   fi
 
 
   __HTTP_INITIALIZED=1
   __HTTP_INITIALIZED=1