From bf8f6cd14840f18835adf6316e7086fb17b9bd30 Mon Sep 17 00:00:00 2001 From: Olia Lisa Date: Thu, 20 Nov 2025 20:43:47 +0800 Subject: [PATCH] update --- config_template/self_cert_config.json | 2 +- install.sh | 78 +++++++++++++++------------ 2 files changed, 46 insertions(+), 34 deletions(-) diff --git a/config_template/self_cert_config.json b/config_template/self_cert_config.json index 665da91..3d302d0 100644 --- a/config_template/self_cert_config.json +++ b/config_template/self_cert_config.json @@ -17,7 +17,7 @@ "masquerade": { "type": "proxy", "proxy": { - "url": "https://bing.com", + "url": "https://你的域名", "rewriteHost": true } } diff --git a/install.sh b/install.sh index e9caec2..0453746 100644 --- a/install.sh +++ b/install.sh @@ -7,35 +7,47 @@ source "${script_dir}/utils/base.sh" check_bash_installed install(){ - echo 安装docker... - curl -fsSL https://get.docker.com | bash -s docker - - echo 安装docker-compose... - wget -O /usr/local/bin/docker-compose https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-x86_64 - chmod +x /usr/local/bin/docker-compose - - echo 安装jq... - package_manager=get_package_manager - if [ "$package_manager" == "apt" ]; then - sudo apt-get update - sudo apt-get install -y jq - elif [ "$package_manager" == "yum" ]; then - sudo yum install -y jq + if command -v docker >/dev/null 2>&1; then + echo "docker 已安装, 跳过." else - echo "未知的包管理器, 请手动安装jq." - exit 1 + echo 安装docker... + curl -fsSL https://get.docker.com | bash -s docker + fi + + if command -v docker-compose >/dev/null 2>&1; then + echo "docker-compose 已安装, 跳过." + else + echo 安装docker-compose... + wget -O /usr/local/bin/docker-compose https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-x86_64 + chmod +x /usr/local/bin/docker-compose + fi + + if command -v jq >/dev/null 2>&1; then + echo "jq 已安装, 跳过." + else + echo 安装jq... + package_manager=get_package_manager + if [ "$package_manager" == "apt" ]; then + sudo apt-get update + sudo apt-get install -y jq + elif [ "$package_manager" == "yum" ]; then + sudo yum install -y jq + else + echo "未知的包管理器, 请手动安装jq." + exit 1 + fi fi } # 显示菜单 echo "请选择一个操作:" -echo "1. 生成配置" -echo "2. 启动容器" -echo "3. 查看分享链接" -echo "4. 停止容器" -echo "5. 更新镜像" -echo "6. 更新端口" -echo "7. 安装并启动" +echo "1. 安装并启动" +echo "2. 生成配置 / 重置配置" +echo "3. 启动容器" +echo "4. 查看分享链接" +echo "5. 停止容器" +echo "6. 更新镜像" +echo "7. 更新端口" # 读取用户选择 read -p "输入您的选择: " choice @@ -43,38 +55,38 @@ read -p "输入您的选择: " choice # 根据用户选择执行相应的操作 case $choice in 1) + # 安装并启动 + install + bash ./bin/run.sh + ;; + 2) # 生成配置 echo "重新生成配置.." bash ./bin/create_config.sh ;; - 2) + 3) # 启动容器 echo "启动容器.." bash ./bin/run.sh ;; - 3) + 4) # 查看分享链接 echo "查看分享链接.." bash ./bin/print_share_link.sh ;; - 4) + 5) # 停止容器 echo "正在停止容器.." docker-compose -f ./docker-compose.yml down ;; - 5) + 6) # 更新镜像 bash ./bin/update_docker_images.sh ;; - 6) + 7) # 更新端口 bash ./bin/update_port.sh ;; - 7) - # 安装并启动 - install - bash ./bin/run.sh - ;; *) echo "无效的选择, 请重新选择." ;;