This commit is contained in:
neil 2016-09-26 13:08:19 +08:00
parent e4b8d9b9d6
commit fbd2038fa7

View File

@ -104,7 +104,7 @@ _info() {
_err() { _err() {
_log "$@" _log "$@"
__red "$(_printargs "$@")" >&2 __red "$(_printargs "$@")\n" >&2
return 1 return 1
} }
@ -3407,13 +3407,13 @@ upgrade() {
_processAccountConf() { _processAccountConf() {
if [ "$_useragent" ] ; then if [ "$_useragent" ] ; then
_saveaccountconf "USER_AGENT" "$_useragent" _saveaccountconf "USER_AGENT" "$_useragent"
elif [ "$USER_AGENT" != "$DEFAULT_USER_AGENT" ] ; then elif [ "$USER_AGENT" ] && [ "$USER_AGENT" != "$DEFAULT_USER_AGENT" ] ; then
_saveaccountconf "USER_AGENT" "$USER_AGENT" _saveaccountconf "USER_AGENT" "$USER_AGENT"
fi fi
if [ "$_accountemail" ] ; then if [ "$_accountemail" ] ; then
_saveaccountconf "ACCOUNT_EMAIL" "$_accountemail" _saveaccountconf "ACCOUNT_EMAIL" "$_accountemail"
elif [ "$ACCOUNT_EMAIL" != "$DEFAULT_ACCOUNT_EMAIL" ] ; then elif [ "$ACCOUNT_EMAIL" ] && [ "$ACCOUNT_EMAIL" != "$DEFAULT_ACCOUNT_EMAIL" ] ; then
_saveaccountconf "ACCOUNT_EMAIL" "$ACCOUNT_EMAIL" _saveaccountconf "ACCOUNT_EMAIL" "$ACCOUNT_EMAIL"
fi fi