Merge branch 'master' of https://github.com/monlor/MIXBOX

2026-03-10 23:41:27 +00:00 · 2020-04-14 10:34:12 +08:00
parent 27d389d7f4 d6929084ec
commit aeb049d104
5 changed files with 3 additions and 3 deletions
--- a/apps/mixbox/bin/base64_linux_arm
+++ b/apps/mixbox/bin/base64_linux_arm
--- a/apps/mixbox/bin/base64_linux_mips
+++ b/apps/mixbox/bin/base64_linux_mips
--- a/apps/mixbox/bin/base64_linux_x86_64
+++ b/apps/mixbox/bin/base64_linux_x86_64
--- 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="修复mixbox命令错误"
-version="0.1.9.6"
+newinfo="修复base64命令段错误,升级后需要手工删除/etc/mixbox/bin/base64*"
+version="0.1.9.7"
--- a/apps/mixbox/scripts/helper.sh
+++ b/apps/mixbox/scripts/helper.sh
@@ -40,7 +40,7 @@ base_encode() {
 	if [ -z "${1}" ]; then
 		echo -n "" 
 	else
-		echo -n "$*" | base64
+		echo -n "$*" | base64 | tr -d '\n'
 	fi
 }