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
a494683b
Commit
a494683b
authored
Aug 02, 2020
by
kapper.net support account
Browse files
Merge branch 'dev' of
https://github.com/kappernet/acme.sh
into dev
parents
2ba6a85e
0e58158a
Changes
1
Hide whitespace changes
Inline
Side-by-side
acme.sh
View file @
a494683b
...
@@ -5642,7 +5642,7 @@ _deactivate() {
...
@@ -5642,7 +5642,7 @@ _deactivate() {
_URL_NAME
=
"uri"
_URL_NAME
=
"uri"
fi
fi
entries
=
"
$(
echo
"
$response
"
| _egrep_o
"
{
*
\"
type
\"
:
\"
[^
\"
]*
\"
, *
\"
status
\"
: *
\"
valid
\"
, *
\"
$_URL_NAME
\"
[^}]*"
)
"
entries
=
"
$(
echo
"
$response
"
| _egrep_o
"
[^{]
*
\"
type
\"
:
\"
[^
\"
]*
\"
, *
\"
status
\"
: *
\"
valid
\"
, *
\"
$_URL_NAME
\"
[^}]*"
)
"
if
[
-z
"
$entries
"
]
;
then
if
[
-z
"
$entries
"
]
;
then
_info
"No valid entries found."
_info
"No valid entries found."
if
[
-z
"
$thumbprint
"
]
;
then
if
[
-z
"
$thumbprint
"
]
;
then
...
@@ -6448,10 +6448,10 @@ _checkSudo() {
...
@@ -6448,10 +6448,10 @@ _checkSudo() {
#it's root using sudo, no matter it's using sudo or not, just fine
#it's root using sudo, no matter it's using sudo or not, just fine
return
0
return
0
fi
fi
if
[
"
$SUDO_COMMAND
"
=
"/bin/su"
]
||
[
"
$SUDO_COMMAND
"
=
"/bin/bash"
]
;
then
if
[
-n
"
$SUDO_COMMAND
"
]
;
then
#it's a normal user doing "sudo su", or `sudo -i` or `sudo -s`
#it's a normal user doing "sudo su", or `sudo -i` or `sudo -s`
#fine
_endswith
"
$SUDO_COMMAND
"
/bin/su
||
grep
"^
$SUDO_COMMAND
\$
"
/etc/shells
>
/dev/null 2>&1
return
0
return
$?
fi
fi
#otherwise
#otherwise
return
1
return
1
...
...
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