From 47f0d12a1f1a1aa11be8e751ecdbf76f0cb596d9 Mon Sep 17 00:00:00 2001
From: YJwu2023 <119829947+YJwu2023@users.noreply.github.com>
Date: Mon, 19 Dec 2022 14:53:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Ddocker=E5=AE=89=E8=A3=85?=
 =?UTF-8?q?=E6=97=B6=E5=BC=82=E5=B8=B8=E9=80=80=E5=87=BA=E7=9A=84bug=20(#1?=
 =?UTF-8?q?19)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 修复docker安装时异常退出的bug

* 修复grub编译脚本的小bug
---
 tools/grub_auto_install.sh | 2 +-
 tools/write_disk_image.sh  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/grub_auto_install.sh b/tools/grub_auto_install.sh
index 6d0432fb..31f05b75 100644
--- a/tools/grub_auto_install.sh
+++ b/tools/grub_auto_install.sh
@@ -9,7 +9,7 @@ mkdir -p ${grub_dir_x86_64_efi}
 
 
 #检测grub是否已经安装
-if [ -d ${grub_dir_i386_efi}/bin ] || [ -d ${grub_dir_i386_legacy}/bin ] && [ -d ${grub_dir_x86_64_efi}/bin ] ; then
+if [ -d ${grub_dir_i386_efi}/bin ] && [ -d ${grub_dir_i386_legacy}/bin ] && [ -d ${grub_dir_x86_64_efi}/bin ] ; then
 	exit 0
 fi
 #仅支持Ubuntu/Debain下的自动安装
diff --git a/tools/write_disk_image.sh b/tools/write_disk_image.sh
index 8acee777..12c326ca 100644
--- a/tools/write_disk_image.sh
+++ b/tools/write_disk_image.sh
@@ -37,7 +37,7 @@ bins[0]=${kernel}
 for file in ${bins[*]};do
 if [ ! -x $file ]; then
 echo "$file 不存在！"
-exit
+exit 
 fi
 done