From db577f8999a2cfac5c3e305eb69437c924a7b618 Mon Sep 17 00:00:00 2001
From: 233boy <31657650+233boy@users.noreply.github.com>
Date: Sun, 30 Aug 2020 10:07:02 +0800
Subject: [PATCH] fix cannot running

---
 src/download-v2ray.sh | 29 +++++++++++++++++++++++++++--
 v2ray.sh              | 10 +++++-----
 2 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/src/download-v2ray.sh b/src/download-v2ray.sh
index 270f284..770ccb7 100644
--- a/src/download-v2ray.sh
+++ b/src/download-v2ray.sh
@@ -33,8 +33,33 @@ _download_v2ray_file() {
 }
 
 _install_v2ray_service() {
-	cp -f "/usr/bin/v2ray/systemd/v2ray.service" "/lib/systemd/system/"
-	sed -i "s/on-failure/always/" /lib/systemd/system/v2ray.service
+	# cp -f "/usr/bin/v2ray/systemd/v2ray.service" "/lib/systemd/system/"
+	# sed -i "s/on-failure/always/" /lib/systemd/system/v2ray.service
+	cat >/lib/systemd/system/v2ray.service <<-EOF
+[Unit]
+Description=V2Ray Service
+Documentation=https://www.v2ray.com/ https://www.v2fly.org/
+After=network.target nss-lookup.target
+
+[Service]
+# If the version of systemd is 240 or above, then uncommenting Type=exec and commenting out Type=simple
+#Type=exec
+Type=simple
+# This service runs as root. You may consider to run it as another user for security concerns.
+# By uncommenting User=nobody and commenting out User=root, the service will run as user nobody.
+# More discussion at https://github.com/v2ray/v2ray-core/issues/1011
+User=root
+#User=nobody
+CapabilityBoundingSet=CAP_NET_ADMIN CAP_NET_BIND_SERVICE
+AmbientCapabilities=CAP_NET_ADMIN CAP_NET_BIND_SERVICE
+NoNewPrivileges=true
+ExecStart=/usr/bin/v2ray/v2ray -config /etc/v2ray/config.json
+#Restart=on-failure
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
+EOF
 	systemctl enable v2ray
 }
 
diff --git a/v2ray.sh b/v2ray.sh
index 3cc5c4a..47d14f0 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="v3.34"
+_version="v3.35"
 
 cmd="apt-get"
 
@@ -21,20 +21,20 @@ i[36]86)
 	v2ray_bit="32"
 	caddy_arch="386"
 	;;
-x86_64)
+'amd64' | x86_64)
 	v2ray_bit="64"
 	caddy_arch="amd64"
 	;;
 *armv6*)
-	v2ray_bit="arm"
+	v2ray_bit="arm32-v6"
 	caddy_arch="arm6"
 	;;
 *armv7*)
-	v2ray_bit="arm"
+	v2ray_bit="arm32-v7a"
 	caddy_arch="arm7"
 	;;
 *aarch64* | *armv8*)
-	v2ray_bit="arm64"
+	v2ray_bit="arm64-v8a"
 	caddy_arch="arm64"
 	;;
 *)