更新 setup.sh

setup.sh

@@ -7,9 +7,8 @@ echo "3. 配置常用alias缩写"
 echo "4. apt安装常用软件"
 echo "5. 配置防火墙"
 echo "6. 安装公钥"
-echo "7. 安装caddy"
+echo "7. 安装conda"
-echo "8. 安装conda"
+echo "8. 安装rust"
-echo "9. 安装rust"
 read -p "输入你的选择: " choices
 
 # 处理选择
@@ -81,16 +80,6 @@ for choice in $choices; do
         chmod 700 ~/.ssh
         ;;
     7)
-        echo "安装caddy"
-        sudo apt install -y debian-keyring debian-archive-keyring apt-transport-https curl gnupg
-        curl -1sLf 'https://dl.cloudsmith.io/public/caddy/stable/gpg.key' | sudo gpg --dearmor -o /usr/share/keyrings/caddy-stable-archive-keyring.gpg
-        curl -1sLf 'https://dl.cloudsmith.io/public/caddy/stable/debian.deb.txt' | sudo tee /etc/apt/sources.list.d/caddy-stable.list
-        sudo apt update
-        sudo apt install caddy
-        mkdir /etc/caddy/sites
-        sed -i '$a import /etc/caddy/sites/*.txt' /etc/caddy/Caddyfile
-        ;;
-    8)
         read -t 30 -p "Conda安装路径 (默认: ~/.miniconda3): " CONDA_PATH
         CONDA_PATH=${CONDA_PATH:-"$HOME/.miniconda3"}
         PROFILE="$HOME/.bashrc"
@@ -115,7 +104,7 @@ for choice in $choices; do
         rm -f "$CONDA_PATH/miniconda.sh"
         echo "source $CONDA_PATH/bin/activate" >> "$PROFILE"
         ;;
-    9)
+    8)
         echo "安装rust"
         curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
         ;;