Skip to content

Commit b505db0

Browse files
committed
fix: support xray x25519 new output format with Password (PublicKey) field
1 parent 5ee41b3 commit b505db0

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

install.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -844,7 +844,7 @@ keys_set() {
844844
keys=$(${xray_bin_dir}/xray x25519 -i "${privateKey}" | tr '\n' ' ')
845845
## 兼容之前的xray版本,一个大版本后删除
846846
if echo "${keys}" | grep -q "Password (PublicKey): "; then
847-
password=$(echo "${keys}" | awk -F"Password (PublicKey): " '{print $2}' | awk '{print $1}')
847+
password=$(echo "${keys}" | awk -F"Password \\(PublicKey\\): " '{print $2}' | awk '{print $1}')
848848
elif echo "${keys}" | grep -q "Password: "; then
849849
password=$(echo "${keys}" | awk -F"Password: " '{print $2}' | awk '{print $1}')
850850
elif echo "${keys}" | grep -q "PublicKey: "; then
@@ -857,7 +857,7 @@ keys_set() {
857857
privateKey=$(echo "${keys}" | awk -F"PrivateKey: " '{print $2}' | awk '{print $1}')
858858
## 兼容之前的xray版本,一个大版本后删除
859859
if echo "${keys}" | grep -q "Password (PublicKey): "; then
860-
password=$(echo "${keys}" | awk -F"Password (PublicKey): " '{print $2}' | awk '{print $1}')
860+
password=$(echo "${keys}" | awk -F"Password \\(PublicKey\\): " '{print $2}' | awk '{print $1}')
861861
elif echo "${keys}" | grep -q "Password: "; then
862862
password=$(echo "${keys}" | awk -F"Password: " '{print $2}' | awk '{print $1}')
863863
elif echo "${keys}" | grep -q "PublicKey: "; then

0 commit comments

Comments
 (0)