Merge pull request #1128 from Neilpang/dev

fix https://github.com/Neilpang/acme.sh/issues/1127
2017-12-02 19:56:39 +08:00 · 2017-12-02 19:56:39 +08:00 · b6aff65997
parent aea631d9d2 b615cce92d
commit b6aff65997
2 changed files with 2 additions and 3 deletions
--- a/2
+++ b/2
@ -1,4 +1,4 @@
-FROM alpine
+FROM alpine:3.6
 RUN apk update -f \
  && apk --no-cache add -f \
--- a/acme.sh
+++ b/acme.sh
@ -463,8 +463,7 @@ if _exists xargs && [ "$(printf %s '\\x41' | xargs printf)" = 'A' ]; then
 fi
 _h2b() {
-  if _exists xxd; then
+  if _exists xxd && xxd -r -p 2>/dev/null; then
    xxd -r -p
    return
  fi