Browse Source
Merge pull request #2 from acmesh-official/dev
sync upstream
pull/3082/head
kapper.net support account
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
4 additions and
4 deletions
-
acme.sh
|
|
@ -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() { |
|
|
#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 |
|
|
|
|
|
return 0 |
|
|
|
|
|
|
|
|
_endswith "$SUDO_COMMAND" /bin/su || grep "^$SUDO_COMMAND\$" /etc/shells >/dev/null 2>&1 |
|
|
|
|
|
return $? |
|
|
fi |
|
|
fi |
|
|
#otherwise |
|
|
#otherwise |
|
|
return 1 |
|
|
return 1 |
|
|
|
