diff --git a/lib/lib-common.sh b/lib/lib-common.sh index 1d04753..074b6dd 100644 --- a/lib/lib-common.sh +++ b/lib/lib-common.sh @@ -23,7 +23,13 @@ third_party_source="https://istore.linkease.com/repo/all/nas_luci" # 路由器信息获取 # ============================================================================ get_router_name() { - model_info=$(cat /tmp/sysinfo/model) + model_info="" + if [ -f /proc/gl-hw-info/model ]; then + model_info=$(cat /proc/gl-hw-info/model) + fi + if [ -f /tmp/sysinfo/model ]; then + model_info="$model_info $(cat /tmp/sysinfo/model)" + fi echo "$model_info" } diff --git a/main.sh b/main.sh index 4934d64..74848b8 100755 --- a/main.sh +++ b/main.sh @@ -15,8 +15,15 @@ HTTP_HOST="https://cafe.cpolar.cn/wkdaily/gl/raw/branch/main" SCRIPT_DIR="/tmp/gl-scripts" ##获取软路由型号信息 +# 同时读取 GL-iNet 原厂硬件信息和 OpenWrt 系统信息,确保机型识别准确 get_router_name() { - model_info=$(cat /tmp/sysinfo/model) + model_info="" + if [ -f /proc/gl-hw-info/model ]; then + model_info=$(cat /proc/gl-hw-info/model) + fi + if [ -f /tmp/sysinfo/model ]; then + model_info="$model_info $(cat /tmp/sysinfo/model)" + fi echo "$model_info" }