Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
Acme.Sh
Commits
8f2a8a00
Unverified
Commit
8f2a8a00
authored
Feb 18, 2019
by
neil
Committed by
GitHub
Feb 18, 2019
Browse files
Merge pull request #1357 from martgras/patch-1
avoid side effects in _printargs
parents
97147b59
65a7d569
Changes
1
Hide whitespace changes
Inline
Side-by-side
acme.sh
View file @
8f2a8a00
...
@@ -139,6 +139,7 @@ __red() {
...
@@ -139,6 +139,7 @@ __red() {
}
}
_printargs
()
{
_printargs
()
{
_exitstatus
=
"
$?
"
if
[
-z
"
$NO_TIMESTAMP
"
]
||
[
"
$NO_TIMESTAMP
"
=
"0"
]
;
then
if
[
-z
"
$NO_TIMESTAMP
"
]
||
[
"
$NO_TIMESTAMP
"
=
"0"
]
;
then
printf
--
"%s"
"[
$(
date
)
] "
printf
--
"%s"
"[
$(
date
)
] "
fi
fi
...
@@ -148,6 +149,8 @@ _printargs() {
...
@@ -148,6 +149,8 @@ _printargs() {
printf
--
"%s"
"
$1
='
$2
'"
printf
--
"%s"
"
$1
='
$2
'"
fi
fi
printf
"
\n
"
printf
"
\n
"
# return the saved exit status
return
"
$_exitstatus
"
}
}
_dlg_versions
()
{
_dlg_versions
()
{
...
@@ -183,6 +186,7 @@ _dlg_versions() {
...
@@ -183,6 +186,7 @@ _dlg_versions() {
#class
#class
_syslog
()
{
_syslog
()
{
_exitstatus
=
"
$?
"
if
[
"
${
SYS_LOG
:-
$SYSLOG_LEVEL_NONE
}
"
=
"
$SYSLOG_LEVEL_NONE
"
]
;
then
if
[
"
${
SYS_LOG
:-
$SYSLOG_LEVEL_NONE
}
"
=
"
$SYSLOG_LEVEL_NONE
"
]
;
then
return
return
fi
fi
...
@@ -196,6 +200,7 @@ _syslog() {
...
@@ -196,6 +200,7 @@ _syslog() {
fi
fi
fi
fi
$__logger_i
-t
"
$PROJECT_NAME
"
-p
"
$_logclass
"
"
$(
_printargs
"
$@
"
)
"
>
/dev/null 2>&1
$__logger_i
-t
"
$PROJECT_NAME
"
-p
"
$_logclass
"
"
$(
_printargs
"
$@
"
)
"
>
/dev/null 2>&1
return
"
$_exitstatus
"
}
}
_log
()
{
_log
()
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment