Merge pull request wukongdaily#2 from wukongdaily/master

合并来自master分支修复的bug：安装casaOS被中断问题
ALTNT · Dec 17, 2023 · a77d840 · a77d840
2 parents 7d210e0 + 7f17d06
commit a77d840
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/shell/diy.sh b/shell/diy.sh
@@ -262,7 +262,7 @@ prepare_for_casaos() {
     sudo cp /etc/os-release /etc/os-release.backup
     # 显示带有红色文本的提示信息
     echo -e
-    echo -e "安装CasaOS过程会自动安装docker,为了避免docker版本冲突,\n需要${GREEN}卸载本机安装过的docker,${NC}${RED}确定要卸载docker吗。是否继续?${NC} [Y/n] "
+    echo -e "安装CasaOS过程会自动安装docker,为了避免docker版本冲突,\n需要${GREEN}卸载本机安装过的docker(若存在),${NC}${RED}确定要卸载docker吗。是否继续?${NC} [Y/n] "
     read -r -n 1 response
     echo
     case $response in
@@ -290,9 +290,9 @@ prepare_for_casaos() {
 
 #卸载docker
 uninstall_docker() {
-    sudo dpkg --configure -a
+    if dpkg -l | grep -qw docker-ce; then
     sudo apt-get purge docker-ce docker-ce-cli containerd.io
-    sudo apt autoremove
+    fi
 }
 
 # 安装CasaOS—Docker