diff --git a/install.sh b/install.sh index 9d2aba0..d4cb47d 100644 --- a/install.sh +++ b/install.sh @@ -36,7 +36,7 @@ OK="${Green}[OK]${Font}" Error="${RedW}[错误]${Font}" Warning="${RedW}[警告]${Font}" -shell_version="2.1.0" +shell_version="2.1.1" shell_mode="未安装" tls_mode="None" ws_grpc_mode="None" @@ -196,21 +196,11 @@ dependency_install() { fi if [[ ${tls_mode} != "None" ]]; then if [[ "${ID}" == "centos" ]]; then - if [[ -z $(${INS} group list installed | grep -i "Development Tools") ]]; then - ${INS} -y groupinstall "Development Tools" - judge "安装 Development Tools" - else - echo -e "${OK} ${GreenBG} 已安装 Development Tools ${Font}" - fi + pkg_install "epel-release,iputils,pcre,pcre-devel,zlib-devel,perl-IPC-Cmd" else - pkg_install "build-essential" + pkg_install "iputils-ping,libpcre3,libpcre3-dev,zlib1g-dev" fi - judge "编译工具包 安装" - fi - if [[ "${ID}" == "centos" ]]; then - pkg_install "epel-release,iputils,pcre,pcre-devel,zlib-devel,perl-IPC-Cmd" - else - pkg_install "iputils-ping,libpcre3,libpcre3-dev,zlib1g-dev" + judge "Nginx 链接库安装" fi } @@ -647,9 +637,9 @@ nginx_upstream_server_set() { read -r nginx_upstream_server_fq case $nginx_upstream_server_fq in [yY][eE][sS] | [yY]) - echo -e "\n${GreenBG} 请选择 追加的协议为 ws 或 gRPC ${Font}" - echo "1: 追加 ws" - echo "2: 追加 gRPC" + echo -e "\n${GreenBG} 请选择协议为 ws 或 gRPC ${Font}" + echo "1: ws" + echo "2: gRPC" echo "3: 返回" read -rp "请输入: " upstream_choose @@ -665,8 +655,8 @@ nginx_upstream_server_set() { chmod +x "${idleleo_dir}/file_manager.sh" fi case $upstream_choose in - 1) source "${idleleo_dir}/file_manager.sh" wsServer ${fm_file_path} ;; - 2) source "${idleleo_dir}/file_manager.sh" grpcServer ${fm_file_path} ;; + 1) source "${idleleo_dir}/file_manager.sh" wsServers ${fm_file_path} ;; + 2) source "${idleleo_dir}/file_manager.sh" grpcServers ${fm_file_path} ;; 3) ;; *) echo -e "${Error} ${RedBG} 无效选项 请重试 ${Font}" @@ -766,7 +756,7 @@ modify_nginx_origin_conf() { modify_nginx_port() { sed -i "s/^\( *\).*ssl;$/\1listen ${port} ssl;/" ${nginx_conf} - sed -i "5s/^\( *\).*ssl;$/\1listen [::]:${port} ssl;/" ${nginx_conf} + sed -i "3s/^\( *\).*ssl;$/\1listen [::]:${port} ssl;/" ${nginx_conf} judge "Xray port 修改" [[ -f ${xray_qr_config_file} ]] && sed -i "s/^\( *\)\"port\".*/\1\"port\": \"${port}\",/" ${xray_qr_config_file} echo -e "${Green} 端口号: ${port} ${Font}" @@ -805,9 +795,15 @@ modify_nginx_other() { fi } -modify_nginx_servers() { - sed -i "/#xray-ws-serverc/c \\\tserver 127.0.0.1:${xport} weight=50 max_fails=2 fail_timeout=10;" ${nginx_upstream_conf} - sed -i "/#xray-grpc-serverc/c \\\tserver 127.0.0.1:${gport} weight=50 max_fails=2 fail_timeout=10;" ${nginx_upstream_conf} +nginx_servers_add() { + touch ${nginx_conf_dir}/127.0.0.1.wsServers + cat >${nginx_conf_dir}/127.0.0.1.wsServers <${nginx_conf_dir}/127.0.0.1.grpcServers<${nginx_conf} <${nginx_conf_dir}/${serverNames}.serverNames <${nginx_upstream_conf} <${nginx_upstream_conf} <