From 46795849a29eef77fd6f7af548d05ee6e654c5bb Mon Sep 17 00:00:00 2001
From: LoGin <longjin@DragonOS.org>
Date: Tue, 24 Oct 2023 13:56:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbootstrap.sh=E5=AE=89?=
 =?UTF-8?q?=E8=A3=85=E9=A1=BA=E5=BA=8F=E5=AF=BC=E8=87=B4=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=20(#407)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tools/bootstrap.sh | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/tools/bootstrap.sh b/tools/bootstrap.sh
index 27f545c8..39dcefba 100644
--- a/tools/bootstrap.sh
+++ b/tools/bootstrap.sh
@@ -39,7 +39,7 @@ install_ubuntu_debian_pkg()
 	echo "正在安装所需的包..."
     sudo "$1" install -y \
         ca-certificates \
-        curl \
+        curl wget \
         unzip \
         gnupg \
         lsb-release \
@@ -48,13 +48,7 @@ install_ubuntu_debian_pkg()
 
     if [ -z "$(which docker)" ] && [ -n ${dockerInstall} ]; then
         echo "正在安装docker..."
-        sudo mkdir -p /etc/apt/keyrings
-        curl -fsSL https://download.docker.com/linux/debian/gpg | sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg
-        echo \
-            "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/debian \
-            $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
-        sudo $1 update
-        sudo "$1" install -y docker-ce docker-ce-cli containerd.io docker-compose-plugin
+        sudo apt install docker.io docker-compose
     elif [ -z ${dockerInstall} ]; then
 		echo "您传入--no-docker参数生效, 安装docker步骤被跳过."
 	elif [ -n "$(which docker)" ]; then
@@ -139,6 +133,10 @@ rustInstall() {
         cargo install cargo-binutils
         rustup toolchain install nightly
         rustup default nightly
+		rustup toolchain install nightly-2023-01-21-x86_64-unknown-linux-gnu
+		rustup toolchain install nightly-2023-08-15-x86_64-unknown-linux-gnu
+		rustup component add rust-src --toolchain nightly-2023-01-21-x86_64-unknown-linux-gnu
+		rustup component add rust-src --toolchain nightly-2023-08-15-x86_64-unknown-linux-gnu
         rustup component add rust-src
 		rustup component add rust-src --toolchain nightly-x86_64-unknown-linux-gnu
         rustup component add llvm-tools-preview
@@ -173,7 +171,6 @@ done
 
 ############ 开始执行 ###############
 banner 			# 开始横幅
-rustInstall     # 安装rust
 
 if [ "Darwin" == "$(uname -s)" ]; then
 	install_osx_pkg "$emulator" || exit 1
@@ -207,6 +204,8 @@ else
 	fi
 fi
 
+rustInstall     # 安装rust
+
 # 安装dadk
 cargo install dadk || exit 1