From 9244a96773ed30177223f218837c7b0b28904d9d Mon Sep 17 00:00:00 2001 From: monlor Date: Thu, 5 Mar 2020 13:50:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbase=5Fencode=EF=BC=8Cbase=5F?= =?UTF-8?q?decode?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 1 + apps/mixbox/bin/{base64_decode => base64-decode} | 0 ...e64_encode_linux_arm => base64-encode_linux_arm} | Bin ...4_encode_linux_mips => base64-encode_linux_mips} | Bin ...code_linux_x86_64 => base64-encode_linux_x86_64} | Bin apps/mixbox/scripts/helper.sh | 8 ++++---- 6 files changed, 5 insertions(+), 4 deletions(-) rename apps/mixbox/bin/{base64_decode => base64-decode} (100%) rename apps/mixbox/bin/{base64_encode_linux_arm => base64-encode_linux_arm} (100%) rename apps/mixbox/bin/{base64_encode_linux_mips => base64-encode_linux_mips} (100%) rename apps/mixbox/bin/{base64_encode_linux_x86_64 => base64-encode_linux_x86_64} (100%) diff --git a/README.md b/README.md index c299a32..a62f4b1 100644 --- a/README.md +++ b/README.md @@ -181,6 +181,7 @@ mixbox help #### 注意事项 * 插件名必须为小写,插件服务名一般为驼峰的写法 +* 插件二进制名称建议与插件名对应,二进制名不能出现下划线,建议用横杠,如obfs-local * 执行完插件生成脚本后,插件会生成在apps中,注意名称不能与现有插件重复 * `gitsync.sh`是打包插件的脚本,-v为更新版本号`可无`,打包的插件生成在appstore下 diff --git a/apps/mixbox/bin/base64_decode b/apps/mixbox/bin/base64-decode similarity index 100% rename from apps/mixbox/bin/base64_decode rename to apps/mixbox/bin/base64-decode diff --git a/apps/mixbox/bin/base64_encode_linux_arm b/apps/mixbox/bin/base64-encode_linux_arm similarity index 100% rename from apps/mixbox/bin/base64_encode_linux_arm rename to apps/mixbox/bin/base64-encode_linux_arm diff --git a/apps/mixbox/bin/base64_encode_linux_mips b/apps/mixbox/bin/base64-encode_linux_mips similarity index 100% rename from apps/mixbox/bin/base64_encode_linux_mips rename to apps/mixbox/bin/base64-encode_linux_mips diff --git a/apps/mixbox/bin/base64_encode_linux_x86_64 b/apps/mixbox/bin/base64-encode_linux_x86_64 similarity index 100% rename from apps/mixbox/bin/base64_encode_linux_x86_64 rename to apps/mixbox/bin/base64-encode_linux_x86_64 diff --git a/apps/mixbox/scripts/helper.sh b/apps/mixbox/scripts/helper.sh index 62f0ff9..cc1532f 100644 --- a/apps/mixbox/scripts/helper.sh +++ b/apps/mixbox/scripts/helper.sh @@ -40,8 +40,8 @@ base_encode() { if [ -z "${1}" ]; then echo -n "" else - if command -v base64_encode &> /dev/null; then - echo -n "$*" | base64_encode + if command -v base64-encode &> /dev/null; then + echo -n "$*" | base64-encode else echo -n "$*" | baseutil --b64 fi @@ -52,8 +52,8 @@ base_decode() { if [ -z "${1}" ]; then echo -n "" else - if command -v base64_decode &> /dev/null; then - echo -n "$*" | base64_decode + if command -v base64-decode &> /dev/null; then + echo -n "$*" | base64-decode else echo -n "$*" | baseutil --b64 -d fi