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
01f54558
Commit
01f54558
authored
Apr 27, 2016
by
neil
Browse files
fix error message.
parent
ca2a96b3
Changes
4
Hide whitespace changes
Inline
Side-by-side
acme.sh
View file @
01f54558
...
@@ -1473,11 +1473,16 @@ issue() {
...
@@ -1473,11 +1473,16 @@ issue() {
_savedomainconf
"Le_NextRenewTimeStr"
"
$Le_NextRenewTimeStr
"
_savedomainconf
"Le_NextRenewTimeStr"
"
$Le_NextRenewTimeStr
"
installcert
$Le_Domain
"
$Le_RealCertPath
"
"
$Le_RealKeyPath
"
"
$Le_RealCACertPath
"
"
$Le_ReloadCmd
"
"
$Le_RealFullChainPath
"
_output
=
"
$(
installcert
$Le_Domain
"
$Le_RealCertPath
"
"
$Le_RealKeyPath
"
"
$Le_RealCACertPath
"
"
$Le_ReloadCmd
"
"
$Le_RealFullChainPath
"
2>&1
)
"
if
[
"
$?
"
=
"9"
]
;
then
_ret
=
"
$?
"
if
[
"
$_ret
"
=
"9"
]
;
then
#ignore the empty install error.
#ignore the empty install error.
return
0
return
0
fi
fi
if
[
"
$_ret
"
!=
"0"
]
;
then
_err
"
$_output
"
return
1
fi
}
}
renew
()
{
renew
()
{
...
...
dnsapi/dns_cf.sh
View file @
01f54558
...
@@ -102,7 +102,7 @@ _get_root() {
...
@@ -102,7 +102,7 @@ _get_root() {
return
1
return
1
fi
fi
if
printf
$response
|
grep
\"
name
\"
:
\"
$h
\"
;
then
if
printf
$response
|
grep
\"
name
\"
:
\"
$h
\"
>
/dev/null
;
then
_domain_id
=
$(
printf
"
$response
"
|
grep
-o
\"
id
\"
:
\"
[
^
\"
]
*
\"
|
head
-1
|
cut
-d
:
-f
2 |
tr
-d
\"
)
_domain_id
=
$(
printf
"
$response
"
|
grep
-o
\"
id
\"
:
\"
[
^
\"
]
*
\"
|
head
-1
|
cut
-d
:
-f
2 |
tr
-d
\"
)
if
[
"
$_domain_id
"
]
;
then
if
[
"
$_domain_id
"
]
;
then
_sub_domain
=
$(
printf
$domain
|
cut
-d
.
-f
1-
$p
)
_sub_domain
=
$(
printf
$domain
|
cut
-d
.
-f
1-
$p
)
...
...
dnsapi/dns_cx.sh
View file @
01f54558
...
@@ -144,7 +144,7 @@ _get_root() {
...
@@ -144,7 +144,7 @@ _get_root() {
return
1
;
return
1
;
fi
fi
if
printf
"
$response
"
|
grep
"
$h
."
;
then
if
printf
"
$response
"
|
grep
"
$h
."
>
/dev/null
;
then
seg
=
$(
printf
"
$response
"
|
grep
-o
"{[^{]*
$h
\.
[^}]*
\}
"
)
seg
=
$(
printf
"
$response
"
|
grep
-o
"{[^{]*
$h
\.
[^}]*
\}
"
)
_debug seg
"
$seg
"
_debug seg
"
$seg
"
_domain_id
=
$(
printf
"
$seg
"
|
grep
-o
\"
id
\"
:
\"
[
^
\"
]
*
\"
|
cut
-d
:
-f
2 |
tr
-d
\"
)
_domain_id
=
$(
printf
"
$seg
"
|
grep
-o
\"
id
\"
:
\"
[
^
\"
]
*
\"
|
cut
-d
:
-f
2 |
tr
-d
\"
)
...
...
dnsapi/dns_dp.sh
View file @
01f54558
...
@@ -152,7 +152,7 @@ _get_root() {
...
@@ -152,7 +152,7 @@ _get_root() {
return
1
return
1
fi
fi
if
printf
"
$response
"
|
grep
"Action completed successful"
;
then
if
printf
"
$response
"
|
grep
"Action completed successful"
>
/dev/null
;
then
_domain_id
=
$(
printf
"
$response
"
|
grep
-o
\"
id
\"
:
\"
[
^
\"
]
*
\"
|
cut
-d
:
-f
2 |
tr
-d
\"
)
_domain_id
=
$(
printf
"
$response
"
|
grep
-o
\"
id
\"
:
\"
[
^
\"
]
*
\"
|
cut
-d
:
-f
2 |
tr
-d
\"
)
_debug _domain_id
"
$_domain_id
"
_debug _domain_id
"
$_domain_id
"
if
[
"
$_domain_id
"
]
;
then
if
[
"
$_domain_id
"
]
;
then
...
...
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