重构代码, 改为函数形式

This commit is contained in:
Olia Lisa 2025-11-22 16:51:09 +08:00
parent dd80d3601b
commit 0c884a87fc
3 changed files with 50 additions and 33 deletions

View File

@ -1,22 +1,27 @@
#!/bin/bash #!/bin/bash
script_dir=$(cd "$(dirname "$0")"; pwd) # 脚本文件绝对路径
docker_compose_file="$script_dir/../docker-compose.yml" # docker-compose.yml文件路径
# 检查是否存在 docker-compose.yml 文件 update_docker_images(){
if [ ! -f $docker_compose_file ]; then script_dir=$(cd "$(dirname "$0")"; pwd) # 脚本文件绝对路径
docker_compose_file="$script_dir/../docker-compose.yml" # docker-compose.yml文件路径
# 检查是否存在 docker-compose.yml 文件
if [ ! -f $docker_compose_file ]; then
echo "Error: docker-compose.yml 文件不存在." echo "Error: docker-compose.yml 文件不存在."
exit 1 exit 1
fi fi
echo "正在关闭容器.." echo "正在关闭容器.."
docker-compose -f $docker_compose_file down docker-compose -f $docker_compose_file down
echo "正在更新镜像.." echo "正在更新镜像.."
docker-compose -f $docker_compose_file pull docker-compose -f $docker_compose_file pull
echo "正在删除未使用的镜像..." echo "正在删除未使用的镜像..."
docker image prune -f docker image prune -f
echo "正在启动容器.." echo "正在启动容器.."
docker-compose -f $docker_compose_file up -d docker-compose -f $docker_compose_file up -d
}
update_docker_images

View File

@ -1,16 +1,23 @@
#!/bin/bash #!/bin/bash
script_dir=$(cd "$(dirname "$0")"; pwd) # 脚本文件绝对路径 update_key(){
config_dir="$script_dir/../conf"
source $script_dir/utils/jq_util.sh
# 使用docker运行xray镜像生成密钥文件 script_dir=$(cd "$(dirname "$0")"; pwd) # 脚本文件绝对路径
docker run --rm teddysun/xray:latest /usr/bin/xray x25519 > $config_dir/key.txt config_dir="$script_dir/../conf"
source $script_dir/utils/jq_util.sh
# 获取私钥 # 使用docker运行xray镜像生成密钥文件
private_key=$(grep "Private" $config_dir/key.txt | awk -F ': ' '{print $2}') docker run --rm teddysun/xray:latest /usr/bin/xray x25519 > $config_dir/key.txt
# 修改config.json密钥属性 # 获取私钥
modify_json_file "$config_dir/config.json" ".inbounds[0].streamSettings.realitySettings.privateKey" "$private_key" private_key=$(grep "Private" $config_dir/key.txt | awk -F ': ' '{print $2}')
echo "生成和设置密钥成功." # 修改config.json密钥属性
modify_json_file "$config_dir/config.json" ".inbounds[0].streamSettings.realitySettings.privateKey" "$private_key"
echo "生成和设置密钥成功."
}
update_key

View File

@ -1,14 +1,19 @@
#!/bin/bash #!/bin/bash
script_dir=$(cd "$(dirname "$0")"; pwd) # 脚本文件绝对路径 update_uuid(){
config_dir="$script_dir/../conf"
source $script_dir/utils/jq_util.sh script_dir=$(cd "$(dirname "$0")"; pwd) # 脚本文件绝对路径
config_dir="$script_dir/../conf"
# 生成 UUID source $script_dir/utils/jq_util.sh
uuid=$(docker run --rm teddysun/xray:latest xray uuid)
#修改 UUID # 生成 UUID
modify_json_file "$config_dir/config.json" ".inbounds[0].settings.clients[0].id" "$uuid" uuid=$(docker run --rm teddysun/xray:latest xray uuid)
echo "设置UUID成功." #修改 UUID
modify_json_file "$config_dir/config.json" ".inbounds[0].settings.clients[0].id" "$uuid"
echo "设置UUID成功."
}
update_uuid