From 5343e2d620089c5d7a71e3bfffc2538ac04b4dd5 Mon Sep 17 00:00:00 2001
From: vincent <vincent0214@qq.com>
Date: Tue, 4 Jan 2022 19:59:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96read=20=E6=B7=BB=E5=8A=A0-e?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 xray.sh | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/xray.sh b/xray.sh
index 5d71591..7e1f9c4 100644
--- a/xray.sh
+++ b/xray.sh
@@ -257,7 +257,7 @@ getData() {
         colorEcho ${YELLOW} "  2. 伪装域名DNS解析指向当前服务器ip（${IP}）"
         colorEcho ${BLUE} "  3. 如果/root目录下有 xray.pem 和 xray.key 证书密钥文件，无需理会条件2"
         echo " "
-        read -p " 确认满足按y，按其他退出脚本：" answer
+        read -ep " 确认满足按y，按其他退出脚本：" answer
         if [[ "${answer,,}" != "y" ]]; then
             exit 0
         fi
@@ -265,7 +265,7 @@ getData() {
         echo ""
         while true
         do
-            read -p " 请输入伪装域名：" DOMAIN
+            read -ep " 请输入伪装域名：" DOMAIN
             if [[ -z "${DOMAIN}" ]]; then
                 colorEcho ${RED} " 域名输入错误，请重新输入！"
             else
@@ -294,10 +294,10 @@ getData() {
     echo ""
     if [[ "$(needNginx)" = "no" ]]; then
         if [[ "$TLS" = "true" ]]; then
-            read -p " 请输入xray监听端口[强烈建议443，默认443]：" PORT
+            read -ep " 请输入xray监听端口[强烈建议443，默认443]：" PORT
             [[ -z "${PORT}" ]] && PORT=443
         else
-            read -p " 请输入xray监听端口[100-65535的一个数字]：" PORT
+            read -ep " 请输入xray监听端口[100-65535的一个数字]：" PORT
             [[ -z "${PORT}" ]] && PORT=`shuf -i200-65000 -n1`
             if [[ "${PORT:0:1}" = "0" ]]; then
                 colorEcho ${RED}  " 端口不能以0开头"
@@ -306,7 +306,7 @@ getData() {
         fi
         colorEcho ${BLUE}  " xray端口：$PORT"
     else
-        read -p " 请输入Nginx监听端口[100-65535的一个数字，默认443]：" PORT
+        read -ep " 请输入Nginx监听端口[100-65535的一个数字，默认443]：" PORT
         [[ -z "${PORT}" ]] && PORT=443
         if [ "${PORT:0:1}" = "0" ]; then
             colorEcho ${BLUE}  " 端口不能以0开头"
@@ -325,7 +325,7 @@ getData() {
         echo "   4) 微信视频通话"
         echo "   5) dtls"
         echo "   6) wiregard"
-        read -p "  请选择伪装类型[默认：无]：" answer
+        read -ep "  请选择伪装类型[默认：无]：" answer
         case $answer in
             2)
                 HEADER_TYPE="utp"
@@ -352,7 +352,7 @@ getData() {
 
     if [[ "$TROJAN" = "true" ]]; then
         echo ""
-        read -p " 请设置trojan密码（不输则随机生成）:" PASSWORD
+        read -ep " 请设置trojan密码（不输则随机生成）:" PASSWORD
         [[ -z "$PASSWORD" ]] && PASSWORD=`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 16 | head -n 1`
         colorEcho $BLUE " trojan密码：$PASSWORD"
     fi
@@ -362,7 +362,7 @@ getData() {
         colorEcho $BLUE " 请选择流控模式:" 
         echo -e "   1) xtls-rprx-direct [$RED推荐$PLAIN]"
         echo "   2) xtls-rprx-origin"
-        read -p "  请选择流控模式[默认:direct]" answer
+        read -ep "  请选择流控模式[默认:direct]" answer
         [[ -z "$answer" ]] && answer=1
         case $answer in
             1)
@@ -383,7 +383,7 @@ getData() {
         echo ""
         while true
         do
-            read -p " 请输入伪装路径，以/开头(不懂请直接回车)：" WSPATH
+            read -ep " 请输入伪装路径，以/开头(不懂请直接回车)：" WSPATH
             if [[ -z "${WSPATH}" ]]; then
                 len=`shuf -i5-12 -n1`
                 ws=`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w $len | head -n 1`
@@ -408,7 +408,7 @@ getData() {
         echo "   3) 美女站(https://imeizi.me)"
         echo "   4) 高清壁纸站(https://bing.imeizi.me)"
         echo "   5) 自定义反代站点(需以http或者https开头)"
-        read -p "  请选择伪装网站类型[默认:1)(推荐)静态网站]" answer
+        read -ep "  请选择伪装网站类型[默认:1)(推荐)静态网站]" answer
         if [[ -z "$answer" ]]; then
             PROXY_URL=""
         else
@@ -439,7 +439,7 @@ getData() {
                 PROXY_URL="https://bing.imeizi.me"
                 ;;
             5)
-                read -p " 请输入反代站点(以http或者https开头)：" PROXY_URL
+                read -ep " 请输入反代站点(以http或者https开头)：" PROXY_URL
                 if [[ -z "$PROXY_URL" ]]; then
                     colorEcho $RED " 请输入反代网站！"
                     exit 1
@@ -460,7 +460,7 @@ getData() {
         colorEcho $BLUE "  是否允许搜索引擎爬取网站？[默认：不允许]"
         echo "    y)允许，会有更多ip请求网站，但会消耗一些流量，vps流量充足情况下推荐使用"
         echo "    n)不允许，爬虫不会访问网站，访问ip比较单一，但能节省vps流量"
-        read -p "  请选择：[y/n]" answer
+        read -ep "  请选择：[y/n]" answer
         if [[ -z "$answer" ]]; then
             ALLOW_SPIDER="n"
         elif [[ "${answer,,}" = "y" ]]; then
@@ -472,7 +472,7 @@ getData() {
     fi
 
     echo ""
-    read -p " 是否安装BBR(默认安装)?[y/n]:" NEED_BBR
+    read -ep " 是否安装BBR(默认安装)?[y/n]:" NEED_BBR
     [[ -z "$NEED_BBR" ]] && NEED_BBR=y
     [[ "$NEED_BBR" = "Y" ]] && NEED_BBR=y
     colorEcho $BLUE " 安装BBR：$NEED_BBR"
@@ -1467,7 +1467,7 @@ uninstall() {
     fi
 
     echo ""
-    read -p " 确定卸载Xray？[y/n]：" answer
+    read -ep " 确定卸载Xray？[y/n]：" answer
     if [[ "${answer,,}" = "y" ]]; then
         domain=`grep Host $CONFIG_FILE | cut -d: -f2 | tr -d \",' '`
         if [[ "$domain" = "" ]]; then
@@ -1836,7 +1836,7 @@ menu() {
     statusText
     echo 
 
-    read -p " 请选择操作[0-17]：" answer
+    read -ep " 请选择操作[0-17]：" answer
     case $answer in
         0)
             exit 0