From 90b5dc024efadac9164e289a17f30bc93ce753b1 Mon Sep 17 00:00:00 2001
From: 233boy <onehack.ttt@gmail.com>
Date: Sat, 5 May 2018 12:12:06 +0800
Subject: [PATCH] [fix] h2 path issues

---
 install.sh | 16 +++++++---------
 v2ray.sh   | 24 ++++++++++--------------
 2 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/install.sh b/install.sh
index a63da87..85b3a80 100644
--- a/install.sh
+++ b/install.sh
@@ -1336,9 +1336,9 @@ do_service() {
 show_config_info() {
 	local header="none"
 	if [[ $path ]]; then
-		local host=$domain
+		local _path="/$path"
 	else
-		local host=""
+		local _path="/"
 	fi
 
 	case $v2ray_transport_opt in
@@ -1394,8 +1394,8 @@ show_config_info() {
 			"aid": "233",
 			"net": "${net}",
 			"type": "none",
-			"host": "${host}",
-			"path": "/$path",
+			"host": "${domain}",
+			"path": "$_path",
 			"tls": "tls"
 		}
 		EOF
@@ -1453,12 +1453,10 @@ show_config_info() {
 		echo
 		echo -e "$yellow 伪装类型 (header type) = ${cyan}${header}$none"
 		echo
-		echo -e "$yellow 伪装域名 (host) = ${cyan}${host}$none"
+		echo -e "$yellow 伪装域名 (host) = ${cyan}${domain}$none"
+		echo
+		echo -e "$yellow 路径 (path) = ${cyan}${_path}$none"
 		echo
-		if [[ $path ]]; then
-			echo -e "$yellow 路径 (path) = ${cyan}/${path}$none"
-			echo
-		fi
 		echo -e "$yellow TLS (Enable TLS) = ${cyan}打开$none"
 		echo
 		# echo -e " 请将 Obfs 设置为 $obfs ...并忽略 传输协议... (如果你使用 Pepi / ShadowRay) "
diff --git a/v2ray.sh b/v2ray.sh
index fb2e520..a958d2a 100644
--- a/v2ray.sh
+++ b/v2ray.sh
@@ -10,7 +10,7 @@ none='\e[0m'
 # Root
 [[ $(id -u) != 0 ]] && echo -e " 哎呀……请使用 ${red}root ${none}用户运行 ${yellow}~(^_^) ${none}" && exit 1
 
-_version="v2.14"
+_version="v2.15"
 
 cmd="apt-get"
 
@@ -127,9 +127,9 @@ ciphers=(
 get_transport_args() {
 	header="none"
 	if [[ $is_path ]]; then
-		host=$domain
+		_path="/$path"
 	else
-		host=""
+		_path="/"
 	fi
 	case $v2ray_transport in
 	1 | 9)
@@ -189,8 +189,8 @@ create_vmess_URL_config() {
 			"aid": "${alterId}",
 			"net": "${net}",
 			"type": "none",
-			"host": "${host}",
-			"path": "/$path",
+			"host": "${domain}",
+			"path": "$_path",
 			"tls": "tls"
 		}
 		EOF
@@ -240,10 +240,8 @@ view_v2ray_config_info() {
 		echo
 		echo -e "$yellow 伪装域名 (host) = ${cyan}${host}$none"
 		echo
-		if [[ $is_path ]]; then
-			echo -e "$yellow 路径 (path) = ${cyan}/${path}$none"
-			echo
-		fi
+		echo -e "$yellow 路径 (path) = ${cyan}${_path}$none"
+		echo
 		echo -e "$yellow TLS (Enable TLS) = ${cyan}打开$none"
 		echo
 		# echo -e " 请将 Obfs 设置为 $obfs ...并忽略 传输协议... (如果你使用 Pepi / ShadowRay) "
@@ -2387,12 +2385,10 @@ create_v2ray_config_text() {
 		echo
 		echo "伪装类型 (header type) = ${header}"
 		echo
-		echo "伪装域名 (host) = ${host}"
+		echo "伪装域名 (host) = ${domain}"
+		echo
+		echo "路径 (path) = ${_path}"
 		echo
-		if [[ $is_path ]]; then
-			echo -e "$yellow 路径 (path) = ${cyan}/${path}$none"
-			echo
-		fi
 		echo "TLS (Enable TLS) = 打开"
 		echo
 		# echo -e " 请将 Obfs 设置为 $obfs ...并忽略 传输协议... (如果你使用 Pepi / ShadowRay) "