Merge pull request #427 from Neilpang/dev

Add NO_TIMESTAMP to mute the timestamp from the output
This commit is contained in:
neil 2016-11-29 00:20:41 +08:00 committed by GitHub
commit 6d84da588b

13
acme.sh
View File

@ -87,10 +87,13 @@ __red() {
} }
_printargs() { _printargs() {
if [ -z "$NO_TIMESTAMP" ] || [ "$NO_TIMESTAMP" = "0" ]; then
printf -- "%s" "[$(date)] "
fi
if [ -z "$2" ]; then if [ -z "$2" ]; then
printf -- "[$(date)] $1" printf -- "%s" "$1"
else else
printf -- "%s" "[$(date)] $1='$2'" printf -- "%s" "$1='$2'"
fi fi
printf "\n" printf "\n"
} }
@ -131,7 +134,9 @@ _info() {
_err() { _err() {
_log "$@" _log "$@"
printf -- "[$(date)] " >&2 if [ -z "$NO_TIMESTAMP" ] || [ "$NO_TIMESTAMP" = "0" ]; then
printf -- "%s" "[$(date)] " >&2
fi
if [ -z "$2" ]; then if [ -z "$2" ]; then
__red "$1" >&2 __red "$1" >&2
else else
@ -3580,7 +3585,7 @@ _initconf() {
#STAGE=1 # Use the staging api #STAGE=1 # Use the staging api
#FORCE=1 # Force to issue cert #FORCE=1 # Force to issue cert
#DEBUG=1 # Debug mode #DEBUG=1 # Debug mode
#NO_TIMESTAMP=1
#OPENSSL_BIN=openssl #OPENSSL_BIN=openssl
#USER_AGENT=\"$USER_AGENT\" #USER_AGENT=\"$USER_AGENT\"