Skip to content

Commit f8b43c0

Browse files
committed
fix: 优化 Docker 安装过程中的 GPG 密钥获取,简化命令并添加对 Debian 系统的支持
1 parent c4bcbf2 commit f8b43c0

1 file changed

Lines changed: 19 additions & 12 deletions

File tree

f8x

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3026,8 +3026,8 @@ Docker_Install(){
30263026
*"Kali"*|*"Debian"*)
30273027
# Add Docker's official GPG key:
30283028
sudo install -m 0755 -d /etc/apt/keyrings
3029-
sudo curl -fsSL https://download.docker.com/linux/debian/gpg -o /etc/apt/keyrings/docker.asc
3030-
sudo chmod a+r /etc/apt/keyrings/docker.asc
3029+
$Proxy_OK curl -fsSL https://download.docker.com/linux/debian/gpg -o /etc/apt/keyrings/docker.asc
3030+
chmod a+r /etc/apt/keyrings/docker.asc
30313031

30323032
# Add the repository to Apt sources:
30333033
tee /etc/apt/sources.list.d/docker.sources <<EOF
@@ -3043,14 +3043,14 @@ EOF
30433043
;;
30443044
*"Ubuntu"*)
30453045
# Add Docker's official GPG key:
3046-
sudo apt update
3047-
sudo apt install ca-certificates curl
3048-
sudo install -m 0755 -d /etc/apt/keyrings
3049-
sudo curl -fsSL https://download.docker.com/linux/ubuntu/gpg -o /etc/apt/keyrings/docker.asc
3050-
sudo chmod a+r /etc/apt/keyrings/docker.asc
3046+
apt update
3047+
apt install -y ca-certificates curl
3048+
install -m 0755 -d /etc/apt/keyrings
3049+
$Proxy_OK curl -fsSL https://download.docker.com/linux/ubuntu/gpg -o /etc/apt/keyrings/docker.asc
3050+
chmod a+r /etc/apt/keyrings/docker.asc
30513051

30523052
# Add the repository to Apt sources:
3053-
sudo tee /etc/apt/sources.list.d/docker.sources <<EOF
3053+
tee /etc/apt/sources.list.d/docker.sources <<EOF
30543054
Types: deb
30553055
URIs: https://download.docker.com/linux/ubuntu
30563056
Suites: $(. /etc/os-release && echo "${UBUNTU_CODENAME:-$VERSION_CODENAME}")
@@ -5795,6 +5795,13 @@ Pentest_ldeep_Install(){
57955795
then
57965796
Echo_ALERT "$name installed"
57975797
else
5798+
case $Linux_Version in
5799+
*"Kali"*|*"Ubuntu"*|*"Debian"*)
5800+
Install_Switch "libkrb5-dev"
5801+
;;
5802+
*) ;;
5803+
esac
5804+
57985805
Install_Switch5 "ldeep"
57995806
which ldeep > /dev/null 2>&1 && Echo_INFOR "Successfully installed $name" || Echo_ERROR3
58005807
fi
@@ -10528,10 +10535,10 @@ kali_Tools_TypeA(){
1052810535
Pentest_ApkAnalyser_Install
1052910536
echo -e "\033[1;33m\n>> Installing apkleaks\n\033[0m"
1053010537
Pentest_apkleaks_Install
10531-
echo -e "\033[1;33m\n>> Installing Diggy\n\033[0m"
10532-
Pentest_Diggy_Install
10533-
echo -e "\033[1;33m\n>> Installing AppInfoScanner\n\033[0m"
10534-
Pentest_AppInfoScanner_Install
10538+
#echo -e "\033[1;33m\n>> Installing Diggy\n\033[0m"
10539+
#Pentest_Diggy_Install
10540+
# echo -e "\033[1;33m\n>> Installing AppInfoScanner\n\033[0m"
10541+
# Pentest_AppInfoScanner_Install
1053510542
echo -e "\033[1;33m\n>> Installing Amass\n\033[0m"
1053610543
Pentest_Amass_Install
1053710544
echo -e "\033[1;33m\n>> Installing dirsearch\n\033[0m"

0 commit comments

Comments
 (0)