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

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

diff --git a/menu.sh b/menu.sh
index 945bb2f..93f9243 100644
--- a/menu.sh
+++ b/menu.sh
@@ -1174,12 +1174,10 @@ 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
-		if [[ ${MAJOR[int]} != 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
+		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
 		${PACKAGE_UPDATE[int]}; ${PACKAGE_INSTALL[int]} cloudflare-warp
 	fi