Merge pull request #601 from Neilpang/dev

Dev
This commit is contained in:
neil 2017-02-10 21:06:14 +08:00 committed by GitHub
commit cea24b5f70

12
acme.sh
View File

@ -364,8 +364,16 @@ _ascii_hex() {
#input:"abc" #input:"abc"
#output: " 61 62 63" #output: " 61 62 63"
_hex_dump() { _hex_dump() {
#in wired some system, the od command is missing. if _exists od; then
if ! od -A n -v -t x1 | tr -d "\r\t" | tr -s " " | sed "s/ $//" | tr -d "\n" 2>/dev/null; then od -A n -v -t x1 | tr -s " " | sed 's/ $//' | tr -d "\r\t\n"
elif _exists hexdump; then
_debug3 "using hexdump"
hexdump -v -e '/1 ""' -e '/1 " %02x" ""'
elif _exists xxd; then
_debug3 "using xxd"
xxd -ps -c 20 -i | sed "s/ 0x/ /g" | tr -d ",\n" | tr -s " "
else
_debug3 "using _ascii_hex"
str=$(cat) str=$(cat)
_ascii_hex "$str" _ascii_hex "$str"
fi fi