diff --git a/apps/entware/scripts/entware.sh b/apps/entware/scripts/entware.sh index 74b4b23..f779639 100644 --- a/apps/entware/scripts/entware.sh +++ b/apps/entware/scripts/entware.sh @@ -37,7 +37,9 @@ init() { [ $? -ne 0 ] && logsh "【Tools】" "创建目录失败,检查你的路径是否正确!" && end umount -lf /opt > /dev/null 2>&1 mount -o blind $path /opt - if [ "$model" = "linux_arm" ]; then + if [ "$xq" = "R3" -o "$xq" = "R1CM" ]; then + wget -O - http://pkg.entware.net/binaries/mipsel/installer/installer.sh | sh + elif [ "$model" = "linux_arm" ]; then if [ "$(uname -r | cut -d'.' -f1)" -ge '3' ]; then wget -O - http://bin.entware.net/armv7sf-k3.2/installer/generic.sh | sh else diff --git a/apps/mixbox/bin/base b/apps/mixbox/bin/base index 686aead..6acf9ec 100644 --- a/apps/mixbox/bin/base +++ b/apps/mixbox/bin/base @@ -2,7 +2,7 @@ #copyright by monlor export PATH=$PATH:/etc/mixbox/bin -mburl_coding="https://qcloud.coding.net/u/monlor/p/MIXBOX/git/raw/master/install.sh" +mburl_coding="https://dev.tencent.com/u/monlor/p/MIXBOX/git/raw/master" mburl_github="https://raw.githubusercontent.com/monlor/MIXBOX/master" mburl=$(mbdb get mixbox.main.url) || mburl="$mburl_coding" mbroot=$(mbdb get mixbox.main.path) diff --git a/appstore/entware_linux_arm.tar.gz b/appstore/entware_linux_arm.tar.gz index 6c23586..26e61a1 100644 Binary files a/appstore/entware_linux_arm.tar.gz and b/appstore/entware_linux_arm.tar.gz differ diff --git a/appstore/entware_linux_mips.tar.gz b/appstore/entware_linux_mips.tar.gz index 31ab3fd..26e61a1 100644 Binary files a/appstore/entware_linux_mips.tar.gz and b/appstore/entware_linux_mips.tar.gz differ diff --git a/appstore/entware_linux_x86_64.tar.gz b/appstore/entware_linux_x86_64.tar.gz index 31ab3fd..26e61a1 100644 Binary files a/appstore/entware_linux_x86_64.tar.gz and b/appstore/entware_linux_x86_64.tar.gz differ diff --git a/appstore/history/entware_linux_arm.tar.gz b/appstore/history/entware_linux_arm.tar.gz index 1d97244..6c23586 100644 Binary files a/appstore/history/entware_linux_arm.tar.gz and b/appstore/history/entware_linux_arm.tar.gz differ diff --git a/appstore/history/entware_linux_mips.tar.gz b/appstore/history/entware_linux_mips.tar.gz index 1d97244..31ab3fd 100644 Binary files a/appstore/history/entware_linux_mips.tar.gz and b/appstore/history/entware_linux_mips.tar.gz differ diff --git a/appstore/history/entware_linux_x86_64.tar.gz b/appstore/history/entware_linux_x86_64.tar.gz index 1d97244..31ab3fd 100644 Binary files a/appstore/history/entware_linux_x86_64.tar.gz and b/appstore/history/entware_linux_x86_64.tar.gz differ diff --git a/appstore/history/mixbox_darwin_x86_64.tar.gz b/appstore/history/mixbox_darwin_x86_64.tar.gz index 8fbd819..43c5734 100644 Binary files a/appstore/history/mixbox_darwin_x86_64.tar.gz and b/appstore/history/mixbox_darwin_x86_64.tar.gz differ diff --git a/appstore/history/mixbox_linux_arm.tar.gz b/appstore/history/mixbox_linux_arm.tar.gz index 78af5c1..4bb79ea 100644 Binary files a/appstore/history/mixbox_linux_arm.tar.gz and b/appstore/history/mixbox_linux_arm.tar.gz differ diff --git a/appstore/history/mixbox_linux_mips.tar.gz b/appstore/history/mixbox_linux_mips.tar.gz index 19d834d..a495e14 100644 Binary files a/appstore/history/mixbox_linux_mips.tar.gz and b/appstore/history/mixbox_linux_mips.tar.gz differ diff --git a/appstore/history/mixbox_linux_x86_64.tar.gz b/appstore/history/mixbox_linux_x86_64.tar.gz index fcfd6d6..6d83d97 100644 Binary files a/appstore/history/mixbox_linux_x86_64.tar.gz and b/appstore/history/mixbox_linux_x86_64.tar.gz differ diff --git a/appstore/mixbox_darwin_x86_64.tar.gz b/appstore/mixbox_darwin_x86_64.tar.gz index 43c5734..70d80ab 100644 Binary files a/appstore/mixbox_darwin_x86_64.tar.gz and b/appstore/mixbox_darwin_x86_64.tar.gz differ diff --git a/appstore/mixbox_linux_arm.tar.gz b/appstore/mixbox_linux_arm.tar.gz index 4bb79ea..e79194a 100644 Binary files a/appstore/mixbox_linux_arm.tar.gz and b/appstore/mixbox_linux_arm.tar.gz differ diff --git a/appstore/mixbox_linux_mips.tar.gz b/appstore/mixbox_linux_mips.tar.gz index a495e14..01573de 100644 Binary files a/appstore/mixbox_linux_mips.tar.gz and b/appstore/mixbox_linux_mips.tar.gz differ diff --git a/appstore/mixbox_linux_x86_64.tar.gz b/appstore/mixbox_linux_x86_64.tar.gz index 6d83d97..4deacd8 100644 Binary files a/appstore/mixbox_linux_x86_64.tar.gz and b/appstore/mixbox_linux_x86_64.tar.gz differ diff --git a/install.sh b/install.sh index adb8229..3cc904b 100644 --- a/install.sh +++ b/install.sh @@ -17,7 +17,7 @@ logsh "【Tools】" "请按任意键安装工具箱(Ctrl + C 退出)." read answer #check root # [ "$USER" != "root" ] && logsh "【Tools】" "请使用root用户安装工具箱!" && exit 1 -mburl="https://dev.tencent.com/u/monlor/p/MIXBOX/git/raw/master" +mburl="https://raw.githubusercontent.com/MIXBOX/master" mbtmp="/tmp/mbtmp" [ ! -d "${mbtmp}" ] && mkdir -p ${mbtmp} model=$(uname -ms | tr ' ' '_' | tr '[A-Z]' '[a-z]')