wkdaily/gl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: 统一替换多脚本公共库加载逻辑

Browse Source 
移除公共库文件存在检查，直接删除旧文件后重新下载，确保始终使用最新版本公共库
同时修复mt3600.sh中的多余空行和缩进格式问题
This commit is contained in:
悟空的日常镜像仓库
2026-07-09 08:53:16 +08:00
parent 4f24f9d5fe
commit 8ff396cf64
8 changed files with 67 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
be3600.sh
View File

@@ -7,12 +7,11 @@ LIB_COMMON="/tmp/lib-common.sh"
# 下载并加载公共库 # 下载并加载公共库
load_common_lib() { load_common_lib() {
if [ ! -f "$LIB_COMMON" ]; then rm -f "$LIB_COMMON"
wget -O "$LIB_COMMON" "$HTTP_HOST/lib/lib-common.sh" 2>/dev/null || { wget -O "$LIB_COMMON" "$HTTP_HOST/lib/lib-common.sh" 2>/dev/null || {
echo "下载公共库失败" echo "下载公共库失败"
exit 1 exit 1
} }
fi
. "$LIB_COMMON" . "$LIB_COMMON"
} }

11
be6500.sh
View File

@@ -7,12 +7,11 @@ LIB_COMMON="/tmp/lib-common.sh"
# 下载并加载公共库 # 下载并加载公共库
load_common_lib() { load_common_lib() {
if [ ! -f "$LIB_COMMON" ]; then rm -f "$LIB_COMMON"
wget -O "$LIB_COMMON" "$HTTP_HOST/lib/lib-common.sh" 2>/dev/null || { wget -O "$LIB_COMMON" "$HTTP_HOST/lib/lib-common.sh" 2>/dev/null || {
echo "下载公共库失败" echo "下载公共库失败"
exit 1 exit 1
} }
fi
. "$LIB_COMMON" . "$LIB_COMMON"
} }

11
be9300.sh
View File

@@ -7,12 +7,11 @@ LIB_COMMON="/tmp/lib-common.sh"
# 下载并加载公共库 # 下载并加载公共库
load_common_lib() { load_common_lib() {
if [ ! -f "$LIB_COMMON" ]; then rm -f "$LIB_COMMON"
wget -O "$LIB_COMMON" "$HTTP_HOST/lib/lib-common.sh" 2>/dev/null || { wget -O "$LIB_COMMON" "$HTTP_HOST/lib/lib-common.sh" 2>/dev/null || {
echo "下载公共库失败" echo "下载公共库失败"
exit 1 exit 1
} }
fi
. "$LIB_COMMON" . "$LIB_COMMON"
} }

11
gl-inet-op24.sh
View File

@@ -11,12 +11,11 @@ chmod +x /usr/bin/g
# 下载并加载公共库 # 下载并加载公共库
load_common_lib() { load_common_lib() {
if [ ! -f "$LIB_COMMON" ]; then rm -f "$LIB_COMMON"
wget -O "$LIB_COMMON" "$HTTP_HOST/lib/lib-common.sh" 2>/dev/null || { wget -O "$LIB_COMMON" "$HTTP_HOST/lib/lib-common.sh" 2>/dev/null || {
echo "下载公共库失败" echo "下载公共库失败"
exit 1 exit 1
} }
fi
. "$LIB_COMMON" . "$LIB_COMMON"
} }

11
gl-inet.sh
View File

@@ -11,12 +11,11 @@ chmod +x /usr/bin/g
# 下载并加载公共库 # 下载并加载公共库
load_common_lib() { load_common_lib() {
if [ ! -f "$LIB_COMMON" ]; then rm -f "$LIB_COMMON"
wget -O "$LIB_COMMON" "$HTTP_HOST/lib/lib-common.sh" 2>/dev/null || { wget -O "$LIB_COMMON" "$HTTP_HOST/lib/lib-common.sh" 2>/dev/null || {
echo "下载公共库失败" echo "下载公共库失败"
exit 1 exit 1
} }
fi
. "$LIB_COMMON" . "$LIB_COMMON"
} }

65
mt3600.sh
View File

@@ -7,12 +7,11 @@ LIB_COMMON="/tmp/lib-common.sh"
# 下载并加载公共库 # 下载并加载公共库
load_common_lib() { load_common_lib() {
if [ ! -f "$LIB_COMMON" ]; then rm -f "$LIB_COMMON"
wget -O "$LIB_COMMON" "$HTTP_HOST/lib/lib-common.sh" 2>/dev/null || { wget -O "$LIB_COMMON" "$HTTP_HOST/lib/lib-common.sh" 2>/dev/null || {
echo "下载公共库失败" echo "下载公共库失败"
exit 1 exit 1
} }
fi
. "$LIB_COMMON" . "$LIB_COMMON"
} }
@@ -50,16 +49,16 @@ do_quickstart() {
do_install_ui_helper_silent() { do_install_ui_helper_silent() {
local ipk_file="/tmp/glinjector_3.0.5-6_all.ipk" local ipk_file="/tmp/glinjector_3.0.5-6_all.ipk"
local sha_file="${ipk_file}.sha256" local sha_file="${ipk_file}.sha256"
wget -O "$sha_file" "$HTTP_HOST/ui/glinjector_3.0.5-6_all.ipk.sha256" || return 1 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 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")" cd "$(dirname "$ipk_file")"
sha256sum -c "$sha_file" || { sha256sum -c "$sha_file" || {
rm -f "$ipk_file" rm -f "$ipk_file"
return 1 return 1
} }
opkg update opkg update
opkg install "$ipk_file" opkg install "$ipk_file"
} }
@@ -97,7 +96,7 @@ while true; do
echo "*******支持的机型列表***************************************************" echo "*******支持的机型列表***************************************************"
green "*******GL-iNet MT3600BE********" green "*******GL-iNet MT3600BE********"
echo echo
light_magenta " 1. $result" light_magenta " 1. $result"
echo echo
light_magenta " 2. 安装argon紫色主题" light_magenta " 2. 安装argon紫色主题"
@@ -117,40 +116,40 @@ while true; do
echo " Q. 退出本程序" echo " Q. 退出本程序"
echo echo
read -p "请选择一个选项: " choice read -p "请选择一个选项: " choice
case $choice in case $choice in
1) 1)
run_quick_install run_quick_install
;; ;;
2) 2)
do_install_argon_skin do_install_argon_skin
;; ;;
3) 3)
do_istore do_istore
;; ;;
4) 4)
hide_ui_elements hide_ui_elements
;; ;;
5) 5)
set_glfan_temp set_glfan_temp
;; ;;
6) 6)
do_install_ui_helper do_install_ui_helper
;; ;;
7) 7)
advanced_uninstall advanced_uninstall
;; ;;
8) 8)
recovery recovery
;; ;;
q | Q) q | Q)
echo "退出" echo "退出"
exit 0 exit 0
;; ;;
*) *)
echo "无效选项，请重新选择。" echo "无效选项，请重新选择。"
;; ;;
esac esac
read -p "按 Enter 键继续..." read -p "按 Enter 键继续..."
done done

11
mt5000.sh
View File

@@ -7,12 +7,11 @@ LIB_COMMON="/tmp/lib-common.sh"
# 下载并加载公共库 # 下载并加载公共库
load_common_lib() { load_common_lib() {
if [ ! -f "$LIB_COMMON" ]; then rm -f "$LIB_COMMON"
wget -O "$LIB_COMMON" "$HTTP_HOST/lib/lib-common.sh" 2>/dev/null || { wget -O "$LIB_COMMON" "$HTTP_HOST/lib/lib-common.sh" 2>/dev/null || {
echo "下载公共库失败" echo "下载公共库失败"
exit 1 exit 1
} }
fi
. "$LIB_COMMON" . "$LIB_COMMON"
} }

11
mudi7.sh
View File

@@ -7,12 +7,11 @@ LIB_COMMON="/tmp/lib-common.sh"
# 下载并加载公共库 # 下载并加载公共库
load_common_lib() { load_common_lib() {
if [ ! -f "$LIB_COMMON" ]; then rm -f "$LIB_COMMON"
wget -O "$LIB_COMMON" "$HTTP_HOST/lib/lib-common.sh" 2>/dev/null || { wget -O "$LIB_COMMON" "$HTTP_HOST/lib/lib-common.sh" 2>/dev/null || {
echo "下载公共库失败" echo "下载公共库失败"
exit 1 exit 1
} }
fi
. "$LIB_COMMON" . "$LIB_COMMON"
} }