diff --git a/apps/mixbox/bin/base64-encode_linux_arm b/apps/mixbox/bin/base64-encode_linux_arm deleted file mode 100644 index 1dce806..0000000 Binary files a/apps/mixbox/bin/base64-encode_linux_arm and /dev/null differ diff --git a/apps/mixbox/bin/base64-encode_linux_mips b/apps/mixbox/bin/base64-encode_linux_mips deleted file mode 100644 index abf2398..0000000 Binary files a/apps/mixbox/bin/base64-encode_linux_mips and /dev/null differ diff --git a/apps/mixbox/bin/base64-encode_linux_x86_64 b/apps/mixbox/bin/base64-encode_linux_x86_64 deleted file mode 100644 index 0db7569..0000000 Binary files a/apps/mixbox/bin/base64-encode_linux_x86_64 and /dev/null differ diff --git a/apps/mixbox/bin/base64_linux_arm b/apps/mixbox/bin/base64_linux_arm new file mode 100755 index 0000000..687b2bc Binary files /dev/null and b/apps/mixbox/bin/base64_linux_arm differ diff --git a/apps/mixbox/bin/base64_linux_mips b/apps/mixbox/bin/base64_linux_mips new file mode 100755 index 0000000..0b758df Binary files /dev/null and b/apps/mixbox/bin/base64_linux_mips differ diff --git a/apps/mixbox/bin/base64_linux_x86_64 b/apps/mixbox/bin/base64_linux_x86_64 new file mode 100755 index 0000000..5a613f8 Binary files /dev/null and b/apps/mixbox/bin/base64_linux_x86_64 differ diff --git a/apps/mixbox/bin/baseutil_linux_arm b/apps/mixbox/bin/baseutil_linux_arm deleted file mode 100755 index 18c8aa8..0000000 Binary files a/apps/mixbox/bin/baseutil_linux_arm and /dev/null differ diff --git a/apps/mixbox/bin/baseutil_linux_mips b/apps/mixbox/bin/baseutil_linux_mips deleted file mode 100755 index 83fcdb2..0000000 Binary files a/apps/mixbox/bin/baseutil_linux_mips and /dev/null differ diff --git a/apps/mixbox/bin/baseutil_linux_x86_64 b/apps/mixbox/bin/baseutil_linux_x86_64 deleted file mode 100755 index 826e807..0000000 Binary files a/apps/mixbox/bin/baseutil_linux_x86_64 and /dev/null differ diff --git a/apps/mixbox/bin/versioncmp_linux_arm b/apps/mixbox/bin/versioncmp_linux_arm deleted file mode 100644 index 9eae185..0000000 Binary files a/apps/mixbox/bin/versioncmp_linux_arm and /dev/null differ diff --git a/apps/mixbox/bin/versioncmp_linux_mips b/apps/mixbox/bin/versioncmp_linux_mips deleted file mode 100644 index ae0c7d5..0000000 Binary files a/apps/mixbox/bin/versioncmp_linux_mips and /dev/null differ diff --git a/apps/mixbox/bin/versioncmp_linux_x86_64 b/apps/mixbox/bin/versioncmp_linux_x86_64 deleted file mode 100644 index e0c7a5b..0000000 Binary files a/apps/mixbox/bin/versioncmp_linux_x86_64 and /dev/null differ diff --git a/apps/mixbox/config/mixbox.uci b/apps/mixbox/config/mixbox.uci index f7e461b..2c7b853 100644 --- a/apps/mixbox/config/mixbox.uci +++ b/apps/mixbox/config/mixbox.uci @@ -4,4 +4,4 @@ needver="" supports="linux_arm,linux_mips,linux_x86_64" appinfo="一款支持多平台,多架构的Shell工具箱" newinfo="修复mixbox命令错误" -version="0.1.9.5" +version="0.1.9.6" diff --git a/apps/mixbox/scripts/helper.sh b/apps/mixbox/scripts/helper.sh index bb38555..28f259a 100644 --- a/apps/mixbox/scripts/helper.sh +++ b/apps/mixbox/scripts/helper.sh @@ -40,11 +40,7 @@ base_encode() { if [ -z "${1}" ]; then echo -n "" else - if base64-encode &> /dev/null; then - echo -n "$*" | base64-encode - else - echo -n "$*" | baseutil --b64 - fi + echo -n "$*" | base64 fi } @@ -52,26 +48,22 @@ base_decode() { if [ -z "${1}" ]; then echo -n "" else - if base64-decode &> /dev/null; then - echo -n "$*" | base64-decode - else - echo -n "$*" | baseutil --b64 -d - fi + echo -n "$*" | base64 -d fi } # $1 > $2 => -1 # $1 < $2 => 1 # $1 = $2 => 0 -# versioncmp() { +versioncmp() { -# [ "$1" = "$2" ] && echo -n "0" && return + [ "$1" = "$2" ] && echo -n "0" && return -# if test "$(echo "$@" | tr " " "\n" | sort -V | head -n 1)" != "$1"; then -# echo -n "-1" -# else -# echo -n "1" -# fi + if test "$(echo "$@" | tr " " "\n" | sort | head -n 1)" != "$1"; then + echo -n "-1" + else + echo -n "1" + fi -# } +}