Proxy-Tools/Xray_bash_onekey
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix bugs

Browse Source
This commit is contained in:
yunshu
2025-03-04 19:56:42 +08:00
parent c422caaae8
commit 933d03caa5
3 changed files with 147 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files
file_manager.sh
+11 -37
View File
@@ -3,7 +3,6 @@
# 定义当前版本号
fm_SCRIPT_VERSION="1.1.0"
# 检查是否提供了扩展名参数
if [ -z "$1" ]; then
echo "$(gettext "用法"):" $0 <$(gettext "文件扩展名")> [<$(gettext "目录路径")>]
exit 1
@@ -12,20 +11,16 @@ fi
fm_EXTENSION="$1"
fm_WORKDIR="${2:-$(pwd)}"
# 检查目录是否存在
if [ ! -d "$fm_WORKDIR" ]; then
echo -e "\n"
echo
log_echo "${Error} ${RedBG} $(gettext "目录") $fm_WORKDIR $(gettext "不存在, 请检查路径") ${Font}"
exit 1
fi
# 保存当前工作目录
fm_original_dir=$(pwd)
# 切换到工作目录
cd "$fm_WORKDIR"
# 函数: 列出当前目录下所有指定扩展名的文件
fm_list_files() {
local max_length
log_echo "${GreenBG} $(gettext "列出所有") .$fm_EXTENSION $(gettext "文件") ${Font}"
@@ -40,7 +35,6 @@ fm_list_files() {
log_echo "${Warning} ${YellowBG} $(gettext "没有找到") .$fm_EXTENSION $(gettext "文件") ${Font}"
return 1
else
# 计算最大文件名长度
local max_length=0
for file in "${files[@]}"; do
local length=${#file}
@@ -49,18 +43,13 @@ fm_list_files() {
fi
done
# 确保最小宽度为 10
if (( max_length < 10 )); then
max_length=10
fi
# 计算总宽度（包括边框）
local total_width=$((max_length + 10))
# 打印表头
printf "%-${total_width}s\n" "$(printf '%*s' "$total_width" | tr ' ' '-')"
# 居中文本
local header_text="$(gettext "文件名")"
local header_length=${#header_text}
local padding=$(( (total_width - header_length - 4) / 2 ))
@@ -71,30 +60,27 @@ fm_list_files() {
printf "%-${total_width}s\n" "$(printf '%*s' "$total_width" | tr ' ' '-')"
# 打印文件名
local index=1
for file in "${files[@]}"; do
printf "| %4d | %-*s |\n" $index $((max_length)) "$file"
((index++))
done
# 打印底部边框
printf "%-${total_width}s\n" "$(printf '%*s' "$total_width" | tr ' ' '-')"
return 0
fi
}
# 函数: 创建一个新的 serverNames 文件
fm_create_servername_file() {
local url
fm_list_files
echo -e "\n"
echo
log_echo "${Green} $(gettext "请输入网址 (例如 hey.run)")"
log_echo "${Green} $(gettext "不要包含 http:// 或 https:// 开头") ${Font}"
read_optimize "$(gettext "请输入"):" url
if [[ $url =~ ^(http|https):// ]]; then
echo -e "\n"
echo
log_echo "${Error} ${RedBG} $(gettext "网址不能包含 http:// 或 https:// 开头") ${Font}"
return
fi
@@ -104,7 +90,6 @@ fm_create_servername_file() {
fm_list_files
}
# 函数: 创建一个新的 wsServers 或 grpcServers 文件
fm_create_ws_or_grpc_server_file() {
local host port weight content firewall_set_fq
fm_list_files
@@ -116,8 +101,7 @@ fm_create_ws_or_grpc_server_file() {
echo "$content" > "${host}.${fm_EXTENSION}"
log_echo "${OK} ${GreenBG} $(gettext "文件") ${host}.${fm_EXTENSION} $(gettext "已创建") ${Font}"
# 询问是否需要修改防火墙
echo -e "\n"
echo
log_echo "${GreenBG} $(gettext "是否需要设置防火墙") [Y/${Red}N${Font}${GreenBG}]? ${Font}"
read -r firewall_set_fq
case $firewall_set_fq in
@@ -151,7 +135,6 @@ fm_create_ws_or_grpc_server_file() {
fm_list_files
}
# 函数: 编辑一个已存在的指定扩展名的文件
fm_edit_file() {
fm_list_files
local num_files=${#files[@]}
@@ -160,7 +143,6 @@ fm_edit_file() {
local filename="${files[$((choice - 1))]}"
# 检查 vim 是否安装
if ! command -v vim &> /dev/null; then
log_echo "${Warning} ${YellowBG} vim $(gettext "未安装, 正在尝试安装") ${Font}"
pkg_install vim
@@ -170,7 +152,6 @@ fm_edit_file() {
fm_restart_nginx_and_check_status
}
# 函数: 删除一个已存在的指定扩展名的文件
fm_delete_file() {
if ! fm_list_files; then
return
@@ -188,7 +169,6 @@ fm_delete_file() {
fm_list_files
}
# 根据扩展名选择创建文件的方式
fm_create_file() {
case $fm_EXTENSION in
serverNames)
@@ -198,13 +178,12 @@ fm_create_file() {
fm_create_ws_or_grpc_server_file
;;
*)
echo -e "\n"
echo
log_echo "${Error} ${RedBG} $(gettext "不支持的文件扩展名") $fm_EXTENSION ${Font}"
;;
esac
}
# 主菜单循环
fm_main_menu() {
fm_list_files
while true; do
@@ -225,7 +204,7 @@ fm_main_menu() {
4) fm_delete_file ;;
5) source "$idleleo" ;;
*)
echo -e "\n"
echo
log_echo "${Error} ${RedBG} $(gettext "无效选项, 请重试") ${Font}"
;;
esac
@@ -236,7 +215,6 @@ fm_check_for_updates() {
local latest_version
local update_choice
# 直接使用 curl 下载远程版本信息
latest_version=$(curl -s "$fm_remote_url" | grep 'fm_SCRIPT_VERSION=' | head -n 1 | sed 's/fm_SCRIPT_VERSION="//; s/"//')
if [ -n "$latest_version" ] && [ "$latest_version" != "$fm_SCRIPT_VERSION" ]; then
log_echo "${Warning} ${YellowBG} $(gettext "新版本可用"): $latest_version $(gettext "当前版本"): $fm_SCRIPT_VERSION ${Font}"
@@ -251,10 +229,10 @@ fm_check_for_updates() {
if [ $? -eq 0 ]; then
chmod +x "${idleleo_dir}/file_manager.sh"
log_echo "${OK} ${Green} $(gettext "下载完成, 正在重新运行脚本")... ${Font}"
bash "${idleleo}" --add-servernames
log_echo "${OK} ${GreenBG} $(gettext "下载完成, 请重新运行脚本") ${Font}"
bash "${idleleo}"
else
echo -e "\n"
echo
log_echo "${Error} ${RedBG} $(gettext "下载失败, 请手动下载并安装新版本") ${Font}"
fi
;;
@@ -271,21 +249,17 @@ fm_restart_nginx_and_check_status() {
if [[ -f ${nginx_systemd_file} ]]; then
systemctl restart nginx
if systemctl is-active --quiet nginx; then
echo -e "\n"
echo
log_echo "${OK} ${GreenBG} Nginx $(gettext "重启成功") ${Font}"
else
echo -e "\n"
echo
log_echo "${Error} ${RedBG} Nginx $(gettext "重启失败"), $(gettext "请检查配置文件是否有误") ${Font}"
fm_edit_file
fi
fi
}
# 检查更新
fm_check_for_updates
# 运行主菜单
fm_main_menu
# 恢复原始工作目录
cd "$fm_original_dir" || exit 1