diff --git a/bin/run.sh b/bin/run.sh index adc77b6..4ec95e9 100644 --- a/bin/run.sh +++ b/bin/run.sh @@ -1,21 +1,23 @@ #!/bin/bash -script_dir=$(cd "$(dirname "$0")"; pwd) # 脚本文件绝对路径 -config_dir=$(readlink -f "$script_dir/../conf") # 配置文件绝对路径 +run(){ + local script_dir=$(cd "$(dirname "$0")"; pwd) # 脚本文件绝对路径 + local config_dir=$(readlink -f "$script_dir/../conf") # 配置文件绝对路径 -# 如果配置文件不存在或者空白 -if [ ! -e "$config_dir/config.json" ] || [ ! -s "$config_dir/config.json" ] ; then - bash "$script_dir/create_config.sh" -fi -# 如果配置未初始化 -uuid=$(jq -r '.inbounds[0].settings.clients[0].id' "$config_dir/config.json") -if [ "$uuid" = "你的UUID" ] || [ -z "$uuid" ]; then - # 执行初始化脚本 - bash "$script_dir/create_config.sh" -fi + # 如果配置文件不存在或者空白 + if [ ! -e "$config_dir/config.json" ] || [ ! -s "$config_dir/config.json" ] ; then + bash "$script_dir/create_config.sh" + fi + # 如果配置未初始化 + local uuid=$(jq -r '.inbounds[0].settings.clients[0].id' "$config_dir/config.json") + if [ "$uuid" = "你的UUID" ] || [ -z "$uuid" ]; then + # 执行初始化脚本 + bash "$script_dir/create_config.sh" + fi -## 启动docker容器 -docker-compose -f $script_dir/../docker-compose.yml up -d + ## 启动docker容器 + docker-compose -f $script_dir/../docker-compose.yml up -d -# 打印分享链接 -bash $script_dir/print_share_link.sh +} + +run diff --git a/install.sh b/install.sh index 2ef8cbb..2d1484f 100644 --- a/install.sh +++ b/install.sh @@ -78,70 +78,65 @@ main(){ # 显示菜单 echo "请选择一个操作:" - echo "0. 安装依赖" - echo "1. 创建配置 / 重置配置" - echo "2. 启动容器" + echo "1. 一键部署" + echo "2. 创建配置 / 重置配置" echo "3. 查看分享链接" - echo "4. 停止容器" - echo "5. 更新镜像" - echo "6. 修改端口" - echo "7. 修改Reality目标域名" - echo "8. 退出" + echo "4. 启动容器" + echo "5. 停止容器" + echo "6. 更新镜像" + echo "7. 修改端口" + echo "8. 修改Reality目标域名" # 读取用户选择 read -p "输入您的选择: " choice # 根据用户选择执行相应的操作 case $choice in - 0) - # 安装依赖 + 1) + # 一键部署 install_dependencies + bash $script_dir/run.sh + bash $script_dir/print_share_link.sh ;; - 1) + 2) # 创建配置 / 重置配置 check_dependencies bash $script_dir/create_config.sh ;; - 2) - # 启动容器 - echo "启动容器.." - check_dependencies - bash $script_dir/run.sh - ;; 3) # 查看分享链接 - echo "查看分享链接.." check_dependencies check_config bash $script_dir/print_share_link.sh ;; 4) - # 停止容器 - echo "正在停止容器.." - docker-compose -f ./docker-compose.yml down + # 启动容器 + check_dependencies + bash $script_dir/run.sh + bash $script_dir/print_share_link.sh ;; 5) + # 停止容器 + docker-compose -f ./docker-compose.yml down + ;; + 6) # 更新镜像 bash $script_dir/update_docker_images.sh ;; - 6) + 7) # 修改端口 check_dependencies check_config bash $script_dir/update_port.sh restart_docker ;; - 7) + 8) # 修改Reality目标域名 check_dependencies check_config bash $script_dir/update_reality_dest.sh restart_docker ;; - 8) - # 退出 - echo "退出程序." - ;; *) echo "无效的选择, 请重新选择." ;;