From 8ff396cf64e729084d205bd8fa454ed9289688ff Mon Sep 17 00:00:00 2001 From: wukongdaily <2666180@gmail.com> Date: Thu, 9 Jul 2026 08:53:16 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E7=BB=9F=E4=B8=80=E6=9B=BF?= =?UTF-8?q?=E6=8D=A2=E5=A4=9A=E8=84=9A=E6=9C=AC=E5=85=AC=E5=85=B1=E5=BA=93?= =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 移除公共库文件存在检查，直接删除旧文件后重新下载，确保始终使用最新版本公共库 同时修复mt3600.sh中的多余空行和缩进格式问题 --- be3600.sh | 11 ++++----- be6500.sh | 11 ++++----- be9300.sh | 11 ++++----- gl-inet-op24.sh | 11 ++++----- gl-inet.sh | 11 ++++----- mt3600.sh | 65 ++++++++++++++++++++++++------------------------- mt5000.sh | 11 ++++----- mudi7.sh | 11 ++++----- 8 files changed, 67 insertions(+), 75 deletions(-) diff --git a/be3600.sh b/be3600.sh index 4e65968..4f69ade 100644 --- a/be3600.sh +++ b/be3600.sh @@ -7,12 +7,11 @@ LIB_COMMON="/tmp/lib-common.sh" # 下载并加载公共库 load_common_lib() { - if [ ! -f "$LIB_COMMON" ]; then - wget -O "$LIB_COMMON" "$HTTP_HOST/lib/lib-common.sh" 2>/dev/null || { - echo "下载公共库失败" - exit 1 - } - fi + rm -f "$LIB_COMMON" + wget -O "$LIB_COMMON" "$HTTP_HOST/lib/lib-common.sh" 2>/dev/null || { + echo "下载公共库失败" + exit 1 + } . "$LIB_COMMON" } diff --git a/be6500.sh b/be6500.sh index 3ef719d..be6f960 100644 --- a/be6500.sh +++ b/be6500.sh @@ -7,12 +7,11 @@ LIB_COMMON="/tmp/lib-common.sh" # 下载并加载公共库 load_common_lib() { - if [ ! -f "$LIB_COMMON" ]; then - wget -O "$LIB_COMMON" "$HTTP_HOST/lib/lib-common.sh" 2>/dev/null || { - echo "下载公共库失败" - exit 1 - } - fi + rm -f "$LIB_COMMON" + wget -O "$LIB_COMMON" "$HTTP_HOST/lib/lib-common.sh" 2>/dev/null || { + echo "下载公共库失败" + exit 1 + } . "$LIB_COMMON" } diff --git a/be9300.sh b/be9300.sh index 58d5e9d..5fabe3b 100644 --- a/be9300.sh +++ b/be9300.sh @@ -7,12 +7,11 @@ LIB_COMMON="/tmp/lib-common.sh" # 下载并加载公共库 load_common_lib() { - if [ ! -f "$LIB_COMMON" ]; then - wget -O "$LIB_COMMON" "$HTTP_HOST/lib/lib-common.sh" 2>/dev/null || { - echo "下载公共库失败" - exit 1 - } - fi + rm -f "$LIB_COMMON" + wget -O "$LIB_COMMON" "$HTTP_HOST/lib/lib-common.sh" 2>/dev/null || { + echo "下载公共库失败" + exit 1 + } . "$LIB_COMMON" } diff --git a/gl-inet-op24.sh b/gl-inet-op24.sh index 642a779..e01c235 100644 --- a/gl-inet-op24.sh +++ b/gl-inet-op24.sh @@ -11,12 +11,11 @@ chmod +x /usr/bin/g # 下载并加载公共库 load_common_lib() { - if [ ! -f "$LIB_COMMON" ]; then - wget -O "$LIB_COMMON" "$HTTP_HOST/lib/lib-common.sh" 2>/dev/null || { - echo "下载公共库失败" - exit 1 - } - fi + rm -f "$LIB_COMMON" + wget -O "$LIB_COMMON" "$HTTP_HOST/lib/lib-common.sh" 2>/dev/null || { + echo "下载公共库失败" + exit 1 + } . "$LIB_COMMON" } diff --git a/gl-inet.sh b/gl-inet.sh index 81df09c..2885f64 100755 --- a/gl-inet.sh +++ b/gl-inet.sh @@ -11,12 +11,11 @@ chmod +x /usr/bin/g # 下载并加载公共库 load_common_lib() { - if [ ! -f "$LIB_COMMON" ]; then - wget -O "$LIB_COMMON" "$HTTP_HOST/lib/lib-common.sh" 2>/dev/null || { - echo "下载公共库失败" - exit 1 - } - fi + rm -f "$LIB_COMMON" + wget -O "$LIB_COMMON" "$HTTP_HOST/lib/lib-common.sh" 2>/dev/null || { + echo "下载公共库失败" + exit 1 + } . "$LIB_COMMON" } diff --git a/mt3600.sh b/mt3600.sh index 044e37c..b1f8911 100644 --- a/mt3600.sh +++ b/mt3600.sh @@ -7,12 +7,11 @@ LIB_COMMON="/tmp/lib-common.sh" # 下载并加载公共库 load_common_lib() { - if [ ! -f "$LIB_COMMON" ]; then - wget -O "$LIB_COMMON" "$HTTP_HOST/lib/lib-common.sh" 2>/dev/null || { - echo "下载公共库失败" - exit 1 - } - fi + rm -f "$LIB_COMMON" + wget -O "$LIB_COMMON" "$HTTP_HOST/lib/lib-common.sh" 2>/dev/null || { + echo "下载公共库失败" + exit 1 + } . "$LIB_COMMON" } @@ -50,16 +49,16 @@ do_quickstart() { do_install_ui_helper_silent() { local ipk_file="/tmp/glinjector_3.0.5-6_all.ipk" local sha_file="${ipk_file}.sha256" - + wget -O "$sha_file" "$HTTP_HOST/ui/glinjector_3.0.5-6_all.ipk.sha256" || return 1 wget --user-agent="Mozilla/5.0" -O "$ipk_file" "$HTTP_HOST/ui/glinjector_3.0.5-6_all.ipk" || return 1 - + cd "$(dirname "$ipk_file")" sha256sum -c "$sha_file" || { rm -f "$ipk_file" return 1 } - + opkg update opkg install "$ipk_file" } @@ -97,7 +96,7 @@ while true; do echo "*******支持的机型列表***************************************************" green "*******GL-iNet MT3600BE********" echo - + light_magenta " 1. $result" echo light_magenta " 2. 安装argon紫色主题" @@ -117,40 +116,40 @@ while true; do echo " Q. 退出本程序" echo read -p "请选择一个选项: " choice - + case $choice in - 1) - run_quick_install + 1) + run_quick_install ;; - 2) - do_install_argon_skin + 2) + do_install_argon_skin ;; - 3) - do_istore + 3) + do_istore ;; - 4) - hide_ui_elements + 4) + hide_ui_elements ;; - 5) - set_glfan_temp + 5) + set_glfan_temp ;; - 6) - do_install_ui_helper + 6) + do_install_ui_helper ;; - 7) - advanced_uninstall + 7) + advanced_uninstall ;; - 8) - recovery + 8) + recovery ;; - q | Q) - echo "退出" - exit 0 + q | Q) + echo "退出" + exit 0 ;; - *) - echo "无效选项，请重新选择。" + *) + echo "无效选项，请重新选择。" ;; esac - + read -p "按 Enter 键继续..." done \ No newline at end of file diff --git a/mt5000.sh b/mt5000.sh index 29e4c75..22ad33c 100644 --- a/mt5000.sh +++ b/mt5000.sh @@ -7,12 +7,11 @@ LIB_COMMON="/tmp/lib-common.sh" # 下载并加载公共库 load_common_lib() { - if [ ! -f "$LIB_COMMON" ]; then - wget -O "$LIB_COMMON" "$HTTP_HOST/lib/lib-common.sh" 2>/dev/null || { - echo "下载公共库失败" - exit 1 - } - fi + rm -f "$LIB_COMMON" + wget -O "$LIB_COMMON" "$HTTP_HOST/lib/lib-common.sh" 2>/dev/null || { + echo "下载公共库失败" + exit 1 + } . "$LIB_COMMON" } diff --git a/mudi7.sh b/mudi7.sh index a7e690b..1cedcbe 100644 --- a/mudi7.sh +++ b/mudi7.sh @@ -7,12 +7,11 @@ LIB_COMMON="/tmp/lib-common.sh" # 下载并加载公共库 load_common_lib() { - if [ ! -f "$LIB_COMMON" ]; then - wget -O "$LIB_COMMON" "$HTTP_HOST/lib/lib-common.sh" 2>/dev/null || { - echo "下载公共库失败" - exit 1 - } - fi + rm -f "$LIB_COMMON" + wget -O "$LIB_COMMON" "$HTTP_HOST/lib/lib-common.sh" 2>/dev/null || { + echo "下载公共库失败" + exit 1 + } . "$LIB_COMMON" }