diff --git a/apps/mixbox/bin/base b/apps/mixbox/bin/base index e3d507f..2bbd350 100644 --- a/apps/mixbox/bin/base +++ b/apps/mixbox/bin/base @@ -281,9 +281,25 @@ parse_str() { } base_encode() { - [ -z "${1}" ] && echo -n "" || echo -n "$*" | baseutil --b64 + if [ -z "${1}" ]; then + echo -n "" + else + if command -v base64_encode &> /dev/null; then + echo -n "$*" | base64_encode + else + echo -n "$*" | baseutil --b64 + fi + fi } base_decode() { - [ -z "${1}" ] && echo -n "" || echo -n "$*" | baseutil --b64 -d + if [ -z "${1}" ]; then + echo -n "" + else + if command -v base64_decode &> /dev/null; then + echo -n "$*" | base64_decode + else + echo -n "$*" | baseutil --b64 -d + fi + fi } diff --git a/apps/mixbox/bin/base64_decode b/apps/mixbox/bin/base64_decode new file mode 100644 index 0000000..12e2418 --- /dev/null +++ b/apps/mixbox/bin/base64_decode @@ -0,0 +1 @@ +base64_encode \ No newline at end of file diff --git a/apps/mixbox/bin/base64_encode_linux_arm b/apps/mixbox/bin/base64_encode_linux_arm new file mode 100644 index 0000000..1dce806 Binary files /dev/null and b/apps/mixbox/bin/base64_encode_linux_arm differ diff --git a/apps/mixbox/bin/base64_encode_linux_mips b/apps/mixbox/bin/base64_encode_linux_mips new file mode 100644 index 0000000..abf2398 Binary files /dev/null and b/apps/mixbox/bin/base64_encode_linux_mips differ diff --git a/apps/mixbox/bin/base64_encode_linux_x86_64 b/apps/mixbox/bin/base64_encode_linux_x86_64 new file mode 100644 index 0000000..0db7569 Binary files /dev/null and b/apps/mixbox/bin/base64_encode_linux_x86_64 differ diff --git a/apps/mixbox/config/mixbox.uci b/apps/mixbox/config/mixbox.uci index 7839ad3..a0d3fbd 100644 --- a/apps/mixbox/config/mixbox.uci +++ b/apps/mixbox/config/mixbox.uci @@ -3,5 +3,5 @@ appname="mixbox" needver="" supports="linux_arm,linux_mips,linux_x86_64" appinfo="一款支持多平台,多架构的Shell工具箱" -newinfo="新增功能parse_str,用于解析变量,新增baseutils工具" -version="0.1.5" +newinfo="新增base64_encode工具" +version="0.1.6"