Browse Source

add ACME_NO_COLOR and `--no-color` not to ouput color text

neilpang 8 years ago
parent
commit
08b4e1a744
1 changed files with 8 additions and 4 deletions
  1. 8 4
      acme.sh

+ 8 - 4
acme.sh

@@ -104,21 +104,21 @@ if [ -t 1 ]; then
 fi
 fi
 
 
 __green() {
 __green() {
-  if [ "$__INTERACTIVE" ]; then
+  if [ "$__INTERACTIVE${ACME_NO_COLOR}" = "1" ]; then
     printf '\033[1;31;32m'
     printf '\033[1;31;32m'
   fi
   fi
   printf -- "%b" "$1"
   printf -- "%b" "$1"
-  if [ "$__INTERACTIVE" ]; then
+  if [ "$__INTERACTIVE${ACME_NO_COLOR}" = "1" ]; then
     printf '\033[0m'
     printf '\033[0m'
   fi
   fi
 }
 }
 
 
 __red() {
 __red() {
-  if [ "$__INTERACTIVE" ]; then
+  if [ "$__INTERACTIVE${ACME_NO_COLOR}" = "1" ]; then
     printf '\033[1;31;40m'
     printf '\033[1;31;40m'
   fi
   fi
   printf -- "%b" "$1"
   printf -- "%b" "$1"
-  if [ "$__INTERACTIVE" ]; then
+  if [ "$__INTERACTIVE${ACME_NO_COLOR}" = "1" ]; then
     printf '\033[0m'
     printf '\033[0m'
   fi
   fi
 }
 }
@@ -4896,6 +4896,7 @@ Parameters:
   --ca-bundle                       Specifies the path to the CA certificate bundle to verify api server's certificate.
   --ca-bundle                       Specifies the path to the CA certificate bundle to verify api server's certificate.
   --ca-path                         Specifies directory containing CA certificates in PEM format, used by wget or curl.
   --ca-path                         Specifies directory containing CA certificates in PEM format, used by wget or curl.
   --nocron                          Only valid for '--install' command, which means: do not install the default cron job. In this case, the certs will not be renewed automatically.
   --nocron                          Only valid for '--install' command, which means: do not install the default cron job. In this case, the certs will not be renewed automatically.
+  --no-color                        Do not output color text.
   --ecc                             Specifies to use the ECC cert. Valid for '--install-cert', '--renew', '--revoke', '--toPkcs' and '--createCSR'
   --ecc                             Specifies to use the ECC cert. Valid for '--install-cert', '--renew', '--revoke', '--toPkcs' and '--createCSR'
   --csr                             Specifies the input csr.
   --csr                             Specifies the input csr.
   --pre-hook                        Command to be run before obtaining any certificates.
   --pre-hook                        Command to be run before obtaining any certificates.
@@ -5343,6 +5344,9 @@ _process() {
       --nocron)
       --nocron)
         _nocron="1"
         _nocron="1"
         ;;
         ;;
+      --no-color)
+        export ACME_NO_COLOR=1
+        ;;
       --ecc)
       --ecc)
         _ecc="isEcc"
         _ecc="isEcc"
         ;;
         ;;