diff --git a/be3600.sh b/be3600.sh index cc0b1a5..dbbd63e 100644 --- a/be3600.sh +++ b/be3600.sh @@ -63,40 +63,25 @@ do_istore() { # 安装所有下载的 .ipk 包 opkg install ./*.ipk - #覆盖 bin/is-opkg + #覆盖 bin/is-opkg wget -O /bin/is-opkg https://cafe.cpolar.top/wkdaily/be3600/raw/branch/master/64bit/is-opkg.sh chmod +x /bin/is-opkg #添加istore软件源 wget -O /etc/opkg/customfeeds.conf https://cafe.cpolar.top/wkdaily/be3600/raw/branch/master/64bit/customfeeds.conf - opkg update + + #调整a53架构优先级 + add_arch_64bit } # 首页和网络向导 do_quickstart() { - # 调整架构信息 - mkdir -p /etc/opkg - touch /etc/opkg/arch.conf - cat </tmp/arch.conf.fake -arch all 1 -arch noarch 1 -arch aarch64_cortex-a53 5 -arch aarch64_cortex-a53_neon-vfpv4 10 -EOF - mount --bind /tmp/arch.conf.fake /etc/opkg/arch.conf - download_lib_quickstart download_luci_quickstart opkg install /tmp/ipk_downloads/*.ipk - - ### 恢复架构信息 - umount /etc/opkg/arch.conf - rm /etc/opkg/arch.conf - green "首页风格安装完毕!请使用8080端口访问luci界面:http://192.168.8.1:8080" green "作者更多动态务必收藏:https://tvhelper.cpolar.top/" - } download_luci_quickstart() { @@ -279,13 +264,13 @@ recovery() { } add_arch_64bit(){ - wget -O /etc/opkg/arch.conf https://cafe.cpolar.top/wkdaily/be3600/raw/branch/master/64bit/arch.conf - #mkdir -p /tmp/assistant - #cd /tmp/assistant - #wget -O luci-app-fileassistant.ipk https://cafe.cpolar.top/wkdaily/be3600/raw/branch/master/64bit/luci-app-fileassistant.ipk - #opkg install *.ipk --force-depends + if ! wget -O /etc/opkg/arch.conf https://cafe.cpolar.top/wkdaily/be3600/raw/branch/master/64bit/arch.conf; then + echo "下载 arch.conf 失败,脚本终止。" + exit 1 + fi } + while true; do clear gl_name=$(get_router_name) @@ -304,6 +289,8 @@ while true; do echo light_magenta " 4. 安装argon紫色主题" echo + light_magenta " 5. 单独安装iStore商店" + echo echo " Q. 退出本程序" echo read -p "请选择一个选项: " choice @@ -328,11 +315,11 @@ while true; do do_istore #安装首页和网络向导 do_quickstart - #调整a53架构优先级 - add_arch_64bit ;; 4) do_install_argon_skin ;; + 5) do_istore + ;; q | Q) echo "退出" exit 0