From b70481534ea68a303fa07f62b6c63c090baad09e Mon Sep 17 00:00:00 2001 From: pocketW <104479902+pocketW@users.noreply.github.com> Date: Mon, 22 Aug 2022 22:50:13 +1000 Subject: [PATCH 1/7] Update config.yml --- config/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/config.yml b/config/config.yml index e8b07c4..cd20719 100644 --- a/config/config.yml +++ b/config/config.yml @@ -14,7 +14,7 @@ ConnetionConfig: BufferSize: 64 # The internal cache size of each connection, kB Nodes: - - PanelType: "SSpanel" # Panel type: SSpanel, V2board, PMpanel, , Proxypanel + PanelType: "SSpanel" # Panel type: SSpanel, V2board, PMpanel, Proxypanel, V2RaySocks ApiConfig: ApiHost: "http://127.0.0.1:667" ApiKey: "123" From 186ccc95269a0f1c24a1ea6ae766c99b6e3db255 Mon Sep 17 00:00:00 2001 From: pocketW <104479902+pocketW@users.noreply.github.com> Date: Fri, 26 Aug 2022 12:11:47 +1000 Subject: [PATCH 2/7] fix: fix install given vision --- install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.sh b/install.sh index 3564857..a7c4838 100644 --- a/install.sh +++ b/install.sh @@ -122,7 +122,7 @@ install_XrayR() { fi else last_version=$1 - url="https://github.com/XrayR-project/XrayR/releases/download/${last_version}/XrayR-linux-${arch}.zip" + url="https://github.com/XrayR-project/XrayR/releases/download/v${last_version}/XrayR-linux-${arch}.zip" echo -e "开始安装 XrayR v$1" wget -q -N --no-check-certificate -O /usr/local/XrayR/XrayR-linux.zip ${url} if [[ $? -ne 0 ]]; then From 2cdd7972f5fd6309aa0bd6663ea74e9a2ffc32ee Mon Sep 17 00:00:00 2001 From: pocketW <104479902+pocketW@users.noreply.github.com> Date: Fri, 26 Aug 2022 12:30:06 +1000 Subject: [PATCH 3/7] chore: make script more robust --- install.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/install.sh b/install.sh index a7c4838..078e9cc 100644 --- a/install.sh +++ b/install.sh @@ -121,12 +121,15 @@ install_XrayR() { exit 1 fi else - last_version=$1 - url="https://github.com/XrayR-project/XrayR/releases/download/v${last_version}/XrayR-linux-${arch}.zip" + if [ $1 == v*]; then + last_version=$1 + else + last_version="v"$1 + url="https://github.com/XrayR-project/XrayR/releases/download/${last_version}/XrayR-linux-${arch}.zip" echo -e "开始安装 XrayR v$1" wget -q -N --no-check-certificate -O /usr/local/XrayR/XrayR-linux.zip ${url} if [[ $? -ne 0 ]]; then - echo -e "${red}下载 XrayR v$1 失败,请确保此版本存在${plain}" + echo -e "${red}下载 XrayR ${last_version} 失败,请确保此版本存在${plain}" exit 1 fi fi From e2820aef7ce611d6152749665ad216cc691ea84e Mon Sep 17 00:00:00 2001 From: pocketW <104479902+pocketW@users.noreply.github.com> Date: Fri, 26 Aug 2022 12:32:36 +1000 Subject: [PATCH 4/7] Update install.sh --- install.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/install.sh b/install.sh index 078e9cc..8dc2646 100644 --- a/install.sh +++ b/install.sh @@ -125,6 +125,7 @@ install_XrayR() { last_version=$1 else last_version="v"$1 + fi url="https://github.com/XrayR-project/XrayR/releases/download/${last_version}/XrayR-linux-${arch}.zip" echo -e "开始安装 XrayR v$1" wget -q -N --no-check-certificate -O /usr/local/XrayR/XrayR-linux.zip ${url} From 417d50fa0b4670a684924cacb2399aea6a27ab55 Mon Sep 17 00:00:00 2001 From: pocketW <104479902+pocketW@users.noreply.github.com> Date: Fri, 26 Aug 2022 12:41:26 +1000 Subject: [PATCH 5/7] Update install.sh --- install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.sh b/install.sh index 8dc2646..0fb0d23 100644 --- a/install.sh +++ b/install.sh @@ -121,7 +121,7 @@ install_XrayR() { exit 1 fi else - if [ $1 == v*]; then + if [[ $1 == v*]]; then last_version=$1 else last_version="v"$1 From 6c175aadb54fd0ffa5359e1f0fc43605a2437fb8 Mon Sep 17 00:00:00 2001 From: pocketW <104479902+pocketW@users.noreply.github.com> Date: Fri, 26 Aug 2022 12:48:49 +1000 Subject: [PATCH 6/7] Update install.sh --- install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.sh b/install.sh index 0fb0d23..57e079a 100644 --- a/install.sh +++ b/install.sh @@ -121,7 +121,7 @@ install_XrayR() { exit 1 fi else - if [[ $1 == v*]]; then + if [[ $1 == v* ]]; then last_version=$1 else last_version="v"$1 From 820c038de3860ad59993c46d9ae240016241fb80 Mon Sep 17 00:00:00 2001 From: pocketW <104479902+pocketW@users.noreply.github.com> Date: Fri, 26 Aug 2022 12:53:40 +1000 Subject: [PATCH 7/7] Update install.sh --- install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.sh b/install.sh index 57e079a..2b4d613 100644 --- a/install.sh +++ b/install.sh @@ -127,7 +127,7 @@ install_XrayR() { last_version="v"$1 fi url="https://github.com/XrayR-project/XrayR/releases/download/${last_version}/XrayR-linux-${arch}.zip" - echo -e "开始安装 XrayR v$1" + echo -e "开始安装 XrayR ${last_version}" wget -q -N --no-check-certificate -O /usr/local/XrayR/XrayR-linux.zip ${url} if [[ $? -ne 0 ]]; then echo -e "${red}下载 XrayR ${last_version} 失败,请确保此版本存在${plain}"