From 225cadfbbd2f3fd49cfffa045f4e073514105017 Mon Sep 17 00:00:00 2001 From: fscarmen <62703343+fscarmen@users.noreply.github.com> Date: Tue, 24 May 2022 23:27:51 +0800 Subject: [PATCH] Update menu.sh --- menu.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/menu.sh b/menu.sh index a53da34..f49ce8e 100644 --- a/menu.sh +++ b/menu.sh @@ -1603,13 +1603,14 @@ proxy(){ rm -f Client_CentOS_8.rpm else { wget https://github.com/fscarmen/warp/raw/main/Client/Client_${SYSTEM}_${VERSION_ID}.deb; }& - [[ $SYSTEM = Debian && ! $(type -P gpg 2>/dev/null) ]] && ${PACKAGE_INSTALL[int]} gnupg + #[[ $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 # 如为 Ubuntu 22.04(jammy) 由于官方库暂未支持,故欺骗为20.04(focal) # CODENAME=$(cat /etc/os-release | grep -i VERSION_CODENAME | sed s/.*=//g | sed "s/jammy/focal/") # curl https://pkg.cloudflareclient.com/pubkey.gpg | gpg --yes --dearmor --output /usr/share/keyrings/cloudflare-warp-archive-keyring.gpg # echo "deb [arch=amd64 signed-by=/usr/share/keyrings/cloudflare-warp-archive-keyring.gpg] https://pkg.cloudflareclient.com/ $CODENAME main" | tee /etc/apt/sources.list.d/cloudflare-client.list wait + ${PACKAGE_INSTALL[int]} desktop-file-utils gnupg2 libjansson4 libnftables1 nftables dpkg -i Client_${SYSTEM}_${VERSION_ID}.deb rm -f Client_${SYSTEM}_${VERSION_ID}.deb fi