Merge pull request #854 from Neilpang/dev

Dev

acme.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-VER=2.6.9
+VER=2.7.0
 
 PROJECT_NAME="acme.sh"
 
@@ -450,31 +450,33 @@ _h2b() {
   fi
 
   hex=$(cat)
-  i=1
+  ic=""
-  j=2
+  jc=""
   _debug2 _URGLY_PRINTF "$_URGLY_PRINTF"
   if [ -z "$_URGLY_PRINTF" ]; then
-    while true; do
+    if _exists xargs; then
-      h="$(printf "%s" "$hex" | cut -c $i-$j)"
+      _debug2 "xargs"
-      if [ -z "$h" ]; then
+      echo "$hex" | sed 's/\([0-9A-F]\{2\}\)/\\\\\\x\1/gI' | xargs printf
-        break
+    else
-      fi
+      for h in $(echo "$hex" | sed 's/\([0-9A-F]\{2\}\)/ \1/gI'); do
-      printf "\x$h%s"
+        if [ -z "$h" ]; then
-      i="$(_math "$i" + 2)"
+          break
-      j="$(_math "$j" + 2)"
+        fi
-    done
+        printf "\x$h%s"
+      done
+    fi
   else
-    while true; do
+    for c in $(echo "$hex" | sed 's/\([0-9A-F]\)/ \1/gI'); do
-      ic="$(printf "%s" "$hex" | cut -c $i)"
+      if [ -z "$ic" ]; then
-      jc="$(printf "%s" "$hex" | cut -c $j)"
+        ic=$c
-      if [ -z "$ic$jc" ]; then
+        continue
-        break
       fi
+      jc=$c
       ic="$(_h_char_2_dec "$ic")"
       jc="$(_h_char_2_dec "$jc")"
       printf '\'"$(printf "%o" "$(_math "$ic" \* 16 + $jc)")""%s"
-      i="$(_math "$i" + 2)"
+      ic=""
-      j="$(_math "$j" + 2)"
+      jc=""
     done
   fi