diff --git a/applist.txt b/applist.txt index cc28e9a..54d4eae 100644 --- a/applist.txt +++ b/applist.txt @@ -3,7 +3,7 @@ aria2|Linux下一款高效的下载工具|更新了R3G的二进制文件|0.0.2|A baidupcs|第三方百度网盘web客户端,基于Go语言|更新arm和mips程序,作者更新了移动ui|0.0.3|BaiduPCS|linux_arm,linux_mips,linux_x86_64,darwin_x86_64 dropbear|移植小米的SSH功能到工具箱|添加备份功能支持|0.0.2|DropBear|linux_arm,linux_mips easyexplorer|一款跨设备的P2P文件同步工具||0.0.2|EasyExplorer|linux_arm,linux_x86_64,darwin_x86_64 -entware|一款开源且强大的包管理工具,许多功能都通过它来实现|增加了启动ONMP安装程序的选项|0.0.2|Entware|linux_arm,linux_mips,linux_x86_64 +entware|一款开源且强大的包管理工具,许多功能都通过它来实现|增加了启动ONMP安装程序的选项|0.0.3|Entware|linux_arm,linux_mips,linux_x86_64 fastdick|迅雷快鸟,快带提速工具||0.0.2|FastDick|linux_arm,linux_mips,linux_x86_64,darwin_x86_64 filebrowser|Web文件浏览器||0.0.2|FileBrowser|linux_arm,linux_mips,linux_x86_64,darwin_x86_64 firewall|防火墙端口开放插件|支持添加多种端口号类型|0.0.2|FireWall|linux_arm,linux_mips,linux_x86_64 diff --git a/apps/entware/config/entware.uci b/apps/entware/config/entware.uci index 6336a92..9de37e5 100644 --- a/apps/entware/config/entware.uci +++ b/apps/entware/config/entware.uci @@ -4,4 +4,4 @@ needver="0.0.1" supports="linux_arm,linux_mips,linux_x86_64" newinfo="增加了启动ONMP安装程序的选项" appinfo="一款开源且强大的包管理工具,许多功能都通过它来实现" -version="0.0.2" +version="0.0.3" diff --git a/apps/entware/scripts/entware.sh b/apps/entware/scripts/entware.sh index f779639..74b4b23 100644 --- a/apps/entware/scripts/entware.sh +++ b/apps/entware/scripts/entware.sh @@ -37,9 +37,7 @@ init() { [ $? -ne 0 ] && logsh "【Tools】" "创建目录失败,检查你的路径是否正确!" && end umount -lf /opt > /dev/null 2>&1 mount -o blind $path /opt - 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 [ "$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/appstore/entware_linux_arm.tar.gz b/appstore/entware_linux_arm.tar.gz index 26e61a1..61611bf 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 26e61a1..61611bf 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 26e61a1..61611bf 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 6c23586..26e61a1 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 31ab3fd..26e61a1 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 31ab3fd..26e61a1 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/install.sh b/install.sh index 5694436..50d1fba 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-BETA/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]')