From c6ec8bc0d9f1db2fb0f90c20a5cfbc0ae552e2f9 Mon Sep 17 00:00:00 2001
From: rewqazxv <41326691+rewqazxv@users.noreply.github.com>
Date: Wed, 6 Nov 2019 18:57:05 +0800
Subject: [PATCH 1/4] fix sudo issue

---
 acme.sh | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/acme.sh b/acme.sh
index 81a20b0b..4a1ce9b7 100755
--- a/acme.sh
+++ b/acme.sh
@@ -6362,11 +6362,17 @@ _checkSudo() {
       #it's root using sudo, no matter it's using sudo or not, just fine
       return 0
     fi
-    if [ "$SUDO_COMMAND" = "/bin/su" ] || [ "$SUDO_COMMAND" = "/bin/bash" ]; then
-      #it's a normal user doing "sudo su", or `sudo -i` or `sudo -s`
-      #fine
-      return 0
-    fi
+    case "$SUDO_COMMAND" in
+      */su )
+        #it's a normal user doing `sudo su`, no problem
+        return 0 ;;
+    esac
+    for i in `cat /etc/shells`; do
+      if [ "$SUDO_COMMAND" = "$i" ]; then
+        #it's a normal user running `sudo -i` or `sudo -s`, fine
+        return 0
+      fi
+    done
     #otherwise
     return 1
   fi

From 6a5ee72722550c76cb925916cfde2f103bda8b40 Mon Sep 17 00:00:00 2001
From: rewqazxv <41326691+rewqazxv@users.noreply.github.com>
Date: Wed, 6 Nov 2019 20:27:12 +0800
Subject: [PATCH 2/4] format code style

---
 acme.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/acme.sh b/acme.sh
index 4a1ce9b7..d3c0fc7a 100755
--- a/acme.sh
+++ b/acme.sh
@@ -6363,11 +6363,12 @@ _checkSudo() {
       return 0
     fi
     case "$SUDO_COMMAND" in
-      */su )
+      */su)
         #it's a normal user doing `sudo su`, no problem
-        return 0 ;;
+        return 0
+        ;;
     esac
-    for i in `cat /etc/shells`; do
+    for i in $(cat /etc/shells); do
       if [ "$SUDO_COMMAND" = "$i" ]; then
         #it's a normal user running `sudo -i` or `sudo -s`, fine
         return 0

From 79ad0ff56baac1a338d4155e40f77bc8eeae8109 Mon Sep 17 00:00:00 2001
From: rewqazxv <41326691+rewqazxv@users.noreply.github.com>
Date: Wed, 15 Jan 2020 22:11:34 +0800
Subject: [PATCH 3/4] Simplify code

---
 acme.sh | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/acme.sh b/acme.sh
index d3c0fc7a..00d10fcc 100755
--- a/acme.sh
+++ b/acme.sh
@@ -6362,18 +6362,11 @@ _checkSudo() {
       #it's root using sudo, no matter it's using sudo or not, just fine
       return 0
     fi
-    case "$SUDO_COMMAND" in
-      */su)
-        #it's a normal user doing `sudo su`, no problem
-        return 0
-        ;;
-    esac
-    for i in $(cat /etc/shells); do
-      if [ "$SUDO_COMMAND" = "$i" ]; then
-        #it's a normal user running `sudo -i` or `sudo -s`, fine
-        return 0
-      fi
-    done
+    if [ -n "$SUDO_COMMAND" ]; then
+      #it's a normal user doing "sudo su", or `sudo -i` or `sudo -s`
+      _endswith "$SUDO_COMMAND" /bin/su || grep "^$SUDO_COMMAND\$" /etc/shells >/dev/null 2>&1
+      return $?
+    fi
     #otherwise
     return 1
   fi

From 4f3f4e23e4f9ca5c11d381c435944c9229128f74 Mon Sep 17 00:00:00 2001
From: Vinton Huang <vi9076@gmail.com>
Date: Mon, 27 Jul 2020 03:55:07 +0800
Subject: [PATCH 4/4] Fix failed test in acmetest. Item alpine:latest - test
 12: le_test_standandalone_deactivate_v2

- Message of failed test [1]: /root/.acme.sh/acme.sh --deactivate -d testdocker.acme.sh [FAIL]
- Reason of failure: left brace was not escaped. According to the standard [2], if special chars appear first in an ERE, it will produce undefined results.
- egrep from busybox (and thus alpine) take it as an error, but egrep from GNU grep (included in most distros) and *BSD are more tolerant, just ignore it.
- Fix: consider the right brace at the right-hand side of the ERE, the result string will not contain right brace. So the left-hand side should not contain left brace, too.
[1] https://github.com/acmesh-official/acmetest/blob/446939706e07c26267d83f71e4d0b8b152b0d3de/logs/alpine-latest.out#L119
[2] 9.4.3 ERE Special Characters, The Open Group Base Specifications. https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap09.html
---
 acme.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/acme.sh b/acme.sh
index f766ef2f..04c60ee6 100755
--- a/acme.sh
+++ b/acme.sh
@@ -5642,7 +5642,7 @@ _deactivate() {
     _URL_NAME="uri"
   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
     _info "No valid entries found."
     if [ -z "$thumbprint" ]; then