From d21e8227ff4d875511e07ef284ae07bfcf408728 Mon Sep 17 00:00:00 2001
From: lsy <lsy22@vip.qq.com>
Date: Sun, 22 Sep 2024 20:42:23 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B2=BE=E7=AE=80=E5=AF=86=E7=A0=81=E5=BA=93?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81,=E5=A2=9E=E5=8A=A0v2bx,xboard=E5=AE=89?=
 =?UTF-8?q?=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Config/Docker/Vaultwarden.sh |  6 +++---
 Config/Docker/Xboard.sh      | 19 +++++++++++++++++++
 Menus/Vpn.sh                 |  1 +
 3 files changed, 23 insertions(+), 3 deletions(-)
 create mode 100644 Config/Docker/Xboard.sh

diff --git a/Config/Docker/Vaultwarden.sh b/Config/Docker/Vaultwarden.sh
index db5583b..fc4f013 100644
--- a/Config/Docker/Vaultwarden.sh
+++ b/Config/Docker/Vaultwarden.sh
@@ -25,7 +25,7 @@ services:
 EOF
 
 if [[ -z $password ]];then
-	awk '!/ADMIN_TOKEN=/' docker-compose.yml > tmpfile && mv tmpfile docker-compose.yml
+	sed -i '/.*ADMIN_TOKEN=.*/d' "docker-compose.yml"
 fi
 
 mkdir templates
@@ -36,8 +36,8 @@ rm main.zip
 cd vaultwarden-lang-zhcn-main 
 declare admin=$( ls | grep "admin" | tac | head -n 1 )
 declare email=$( ls | grep "email" | tac | head -n 1 )
-mv "$admin" admin && cp -r admin ..
-mv "$email" email && cp -r email ..
+mv "$admin" "../admin"
+mv "$email" "../email"
 cd ..
 rm -rf vaultwarden-lang-zhcn-main
 sudo docker compose up -d || echo "安装失败" && exit
diff --git a/Config/Docker/Xboard.sh b/Config/Docker/Xboard.sh
new file mode 100644
index 0000000..b7b1751
--- /dev/null
+++ b/Config/Docker/Xboard.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+declare path=$1
+declare port=$2
+cd $path
+
+declare namediv=$(basename $path)
+cd ..
+rm -rf "$namediv"
+
+git clone -b  docker-compose --depth 1 https://github.com/cedar2025/Xboard
+mv Xboard "$namediv"
+cd "$path"
+
+docker compose run -it --rm xboard php artisan xboard:install
+
+docker compose up -d > /dev/null
+
+sleep 5
+echo "网站端口默认7001，记得防火墙放行"
\ No newline at end of file
diff --git a/Menus/Vpn.sh b/Menus/Vpn.sh
index 6f5adde..9f305c7 100644
--- a/Menus/Vpn.sh
+++ b/Menus/Vpn.sh
@@ -7,6 +7,7 @@ declarec vpn_pick
 vpn_array["v2ray"]='bash <(curl -s -L https://git.io/v2ray.sh)'
 vpn_array["v2ray-agent"]='wget -P /root -N --no-check-certificate "https://raw.githubusercontent.com/mack-a/v2ray-agent/master/install.sh" && chmod 700 /root/install.sh && /root/install.sh'
 vpn_array["x-ui"]='bash <(curl -Ls https://raw.githubusercontent.com/FranzKafkaYu/x-ui/master/install.sh)'
+vpn_array["V2bX"]='wget -N https://raw.githubusercontent.com/wyx2685/V2bX-script/master/install.sh && bash install.sh'
 
 for i in "${!vpn_array[@]}";do
   vpn_index[${vpn_number}]=${i}