From ca9cd45fe7aa260133d897b2e5b5ad05c5a11eff Mon Sep 17 00:00:00 2001
From: fscarmen <62703343+fscarmen@users.noreply.github.com>
Date: Thu, 10 Mar 2022 10:35:33 +0800
Subject: [PATCH] Update menu.sh

---
 menu.sh | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/menu.sh b/menu.sh
index 93f9243..706f30b 100644
--- a/menu.sh
+++ b/menu.sh
@@ -1174,10 +1174,12 @@ proxy(){
 	[[ $SYSTEM = Debian && ! $(type -P gpg 2>/dev/null) ]] && ${PACKAGE_INSTALL[int]} gnupg
 	[[ $SYSTEM = Debian && ! $(apt list 2>/dev/null | grep apt-transport-https ) =~ installed ]] && ${PACKAGE_INSTALL[int]} apt-transport-https
 	if [[ $SYSTEM != CentOS ]]; then
-		curl https://pkg.cloudflareclient.com/pubkey.gpg | apt-key add -
-		[[ $(echo $SYS | sed "s/[^0-9.]//g" | cut -d. -f1) != 18 ]] &&
-		echo "deb http://pkg.cloudflareclient.com/ $(lsb_release -sc) main" | tee /etc/apt/sources.list.d/cloudflare-client.list ||
-		echo 'deb [signed-by=/usr/share/keyrings/cloudflare-main.gpg] https://pkg.cloudflare.com/ focal main' | tee /etc/apt/sources.list.d/cloudflare-main.list
+		if [[ $(echo $SYS | sed "s/[^0-9.]//g" | cut -d. -f1) != 18 ]]; then
+			curl https://pkg.cloudflareclient.com/pubkey.gpg | apt-key add -
+			echo "deb http://pkg.cloudflareclient.com/ $(lsb_release -sc) main" | tee /etc/apt/sources.list.d/cloudflare-client.list
+		else curl https://pkg.cloudflare.com/cloudflare-main.gpg -o /usr/share/keyrings/cloudflare-main.gpg	
+			echo 'deb [signed-by=/usr/share/keyrings/cloudflare-main.gpg] https://pkg.cloudflare.com/ focal main' | tee /etc/apt/sources.list.d/cloudflare-main.list
+		fi
 		${PACKAGE_UPDATE[int]}; ${PACKAGE_INSTALL[int]} cloudflare-warp
 	fi