Browse Source

Wget (#678) (#679)

* --use-wget force to use wget

* fix force wget
neil 8 years ago
parent
commit
59f7a2f6ef
1 changed files with 14 additions and 2 deletions
  1. 14 2
      acme.sh

+ 14 - 2
acme.sh

@@ -1505,7 +1505,7 @@ _post() {
 
 
   _inithttp
   _inithttp
 
 
-  if [ "$_ACME_CURL" ]; then
+  if [ "$_ACME_CURL" ] && [ "${ACME_USE_WGET:-0}" = "0" ]; then
     _CURL="$_ACME_CURL"
     _CURL="$_ACME_CURL"
     if [ "$HTTPS_INSECURE" ]; then
     if [ "$HTTPS_INSECURE" ]; then
       _CURL="$_CURL --insecure  "
       _CURL="$_CURL --insecure  "
@@ -1572,7 +1572,7 @@ _get() {
 
 
   _inithttp
   _inithttp
 
 
-  if [ "$_ACME_CURL" ]; then
+  if [ "$_ACME_CURL" ] && [ "${ACME_USE_WGET:-0}" = "0" ]; then
     _CURL="$_ACME_CURL"
     _CURL="$_ACME_CURL"
     if [ "$HTTPS_INSECURE" ]; then
     if [ "$HTTPS_INSECURE" ]; then
       _CURL="$_CURL --insecure  "
       _CURL="$_CURL --insecure  "
@@ -4787,6 +4787,7 @@ Parameters:
   --listen-v4                       Force standalone/tls server to listen at ipv4.
   --listen-v4                       Force standalone/tls server to listen at ipv4.
   --listen-v6                       Force standalone/tls server to listen at ipv6.
   --listen-v6                       Force standalone/tls server to listen at ipv6.
   --openssl-bin                     Specifies a custom openssl bin location.
   --openssl-bin                     Specifies a custom openssl bin location.
+  --use-wget                        Force to use wget, if you have both curl and wget installed.
   "
   "
 }
 }
 
 
@@ -4865,6 +4866,12 @@ _processAccountConf() {
     _saveaccountconf "AUTO_UPGRADE" "$AUTO_UPGRADE"
     _saveaccountconf "AUTO_UPGRADE" "$AUTO_UPGRADE"
   fi
   fi
 
 
+  if [ "$_use_wget" ]; then
+    _saveaccountconf "ACME_USE_WGET" "$_use_wget"
+  elif [ "$ACME_USE_WGET" ]; then
+    _saveaccountconf "ACME_USE_WGET" "$ACME_USE_WGET"
+  fi
+
 }
 }
 
 
 _process() {
 _process() {
@@ -4909,6 +4916,7 @@ _process() {
   _listen_v6=""
   _listen_v6=""
   _openssl_bin=""
   _openssl_bin=""
   _syslog=""
   _syslog=""
+  _use_wget=""
   while [ ${#} -gt 0 ]; do
   while [ ${#} -gt 0 ]; do
     case "${1}" in
     case "${1}" in
 
 
@@ -5288,6 +5296,10 @@ _process() {
         ACME_OPENSSL_BIN="$_openssl_bin"
         ACME_OPENSSL_BIN="$_openssl_bin"
         shift
         shift
         ;;
         ;;
+      --use-wget)
+        _use_wget="1"
+        ACME_USE_WGET="1"
+        ;;
       *)
       *)
         _err "Unknown parameter : $1"
         _err "Unknown parameter : $1"
         return 1
         return 1