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

移除公共库文件存在检查,直接删除旧文件后重新下载,确保始终使用最新版本公共库
同时修复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

View File

@@ -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"
}

View File

@@ -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"
}

View File

@@ -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"
}

View File

@@ -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"
}

View File

@@ -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"
}

View File

@@ -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"
}
@@ -119,36 +118,36 @@ while true; do
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

View File

@@ -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"
}

View File

@@ -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"
}