From 0d751ebf0e2eb2888e2ee018dfded3dc8ad5b2ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=94=AC=E5=93=A5=E4=BE=83=E4=BE=83=E4=BE=83ygkkk?= Date: Sun, 5 Mar 2023 00:35:21 +0000 Subject: [PATCH] Update CFwarp.sh --- CFwarp.sh | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/CFwarp.sh b/CFwarp.sh index 292d5ec..a8ac948 100644 --- a/CFwarp.sh +++ b/CFwarp.sh @@ -48,18 +48,7 @@ op=`sys` version=`uname -r | awk -F "-" '{print $1}'` main=`uname -r | awk -F . '{print $1}'` minor=`uname -r | awk -F . '{print $2}'` -bit=`uname -m` -[[ $bit = aarch64 ]] && cpu=arm64 -if [[ $bit = x86_64 ]]; then -#cpu=amd64 -amdv=$(cat /proc/cpuinfo | grep flags | head -n 1 | cut -d: -f2) -case "$amdv" in -*avx512*) cpu=amd64v4;; -*avx2*) cpu=amd64v3;; -*sse3*) cpu=amd64v2;; -*) cpu=amd64;; -esac -fi + vi=`systemd-detect-virt` if [[ $vi = openvz ]]; then TUN=$(cat /dev/net/tun 2>&1) @@ -991,6 +980,18 @@ esac if [ $# == 0 ]; then warpwgcf start +bit=`uname -m` +[[ $bit = aarch64 ]] && cpu=arm64 +if [[ $bit = x86_64 ]]; then +#cpu=amd64 +amdv=$(cat /proc/cpuinfo | grep flags | head -n 1 | cut -d: -f2) +case "$amdv" in +*avx512*) cpu=amd64v4;; +*avx2*) cpu=amd64v3;; +*sse3*) cpu=amd64v2;; +*) cpu=amd64;; +esac +fi start_menu fi } @@ -1569,6 +1570,11 @@ fi if [ $# == 0 ]; then warpgo start +bit=`uname -m` +[[ $bit = aarch64 ]] && cpu=arm64 +if [[ $bit = x86_64 ]]; then +cpu=amd64 +fi start_menu fi }