From 3d77814af41d2cb27a1f2195f71a8dad778b5672 Mon Sep 17 00:00:00 2001
From: Olia Lisa <kannar7788@gmail.com>
Date: Fri, 24 Jul 2026 11:36:25 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E9=87=8D=E6=9E=84"=E6=9E=84?=
 =?UTF-8?q?=E5=BB=BA=E7=BB=93=E6=9E=9C=E5=88=A4=E6=96=AD"=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E7=89=87=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 x86-64.sh | 60 ++++++++++++++++++++++++++++---------------------------
 1 file changed, 31 insertions(+), 29 deletions(-)

diff --git a/x86-64.sh b/x86-64.sh
index f385717..9f98b42 100644
--- a/x86-64.sh
+++ b/x86-64.sh
@@ -187,35 +187,8 @@ build(){
       EXTRA_IMAGE_NAME="$EXTRA_IMAGE_NAME" \
       ${ROOTFS_PARTSIZE:+ROOTFS_PARTSIZE="$ROOTFS_PARTSIZE"} # ROOTFS_PARTSIZE 参数不为空才添加
 
-  # 构建结果判断
-  if [ $? -eq 0 ]; then
-      if [ "$OUTPUT_DIR" != "$PROJECT_OUTPUT_DIR" ]; then
-          if [ ! -d "$OUTPUT_DIR" ]; then
-              echo -e "${RED}   未找到构建输出目录: ${OUTPUT_DIR}${NC}"
-              exit 1
-          fi
-
-          if [ -e "$PROJECT_OUTPUT_DIR" ]; then
-              BACKUP_OUTPUT_DIR="${PROJECT_OUTPUT_DIR}.bak.$(date +%Y%m%d%H%M%S)"
-              if ! mv "$PROJECT_OUTPUT_DIR" "$BACKUP_OUTPUT_DIR"; then
-                  echo -e "${RED}   备份已有输出目录失败: ${PROJECT_OUTPUT_DIR}${NC}"
-                  exit 1
-              fi
-              echo -e "${YELLOW}   已有输出目录，已备份到: ${BACKUP_OUTPUT_DIR}${NC}"
-          fi
-
-          if ! mv "$OUTPUT_DIR" "$PROJECT_OUTPUT_DIR"; then
-              echo -e "${RED}   移动构建输出目录失败: ${OUTPUT_DIR} -> ${PROJECT_OUTPUT_DIR}${NC}"
-              exit 1
-          fi
-      fi
-
-      echo ""
-      echo -e "${GREEN}========================================${NC}"
-      echo -e "${GREEN}   构建成功！${NC}"
-      echo -e "${GREEN}   固件路径: ${PROJECT_OUTPUT_DIR}${NC}"
-      echo -e "${GREEN}========================================${NC}"
-  else
+  # 构建失败
+  if [ $? -ne 0 ]; then
       echo ""
       echo -e "${RED}========================================${NC}"
       echo -e "${RED}   构建失败，请检查上方错误日志${NC}"
@@ -223,6 +196,35 @@ build(){
       exit 1
   fi
 
+  # 构建成功
+  if [ "$OUTPUT_DIR" != "$PROJECT_OUTPUT_DIR" ]; then
+      if [ ! -d "$OUTPUT_DIR" ]; then
+          echo -e "${RED}   未找到构建输出目录: ${OUTPUT_DIR}${NC}"
+          exit 1
+      fi
+
+      if [ -e "$PROJECT_OUTPUT_DIR" ]; then
+          BACKUP_OUTPUT_DIR="${PROJECT_OUTPUT_DIR}.bak.$(date +%Y%m%d%H%M%S)"
+
+          if ! mv "$PROJECT_OUTPUT_DIR" "$BACKUP_OUTPUT_DIR"; then
+              echo -e "${RED}   备份已有输出目录失败: ${PROJECT_OUTPUT_DIR}${NC}"
+              exit 1
+          fi
+
+          echo -e "${YELLOW}   已有输出目录，已备份到: ${BACKUP_OUTPUT_DIR}${NC}"
+      fi
+
+      if ! mv "$OUTPUT_DIR" "$PROJECT_OUTPUT_DIR"; then
+          echo -e "${RED}   移动构建输出目录失败: ${OUTPUT_DIR} -> ${PROJECT_OUTPUT_DIR}${NC}"
+          exit 1
+      fi
+  fi
+  echo ""
+  echo -e "${GREEN}========================================${NC}"
+  echo -e "${GREEN}   构建成功！${NC}"
+  echo -e "${GREEN}   固件路径: ${PROJECT_OUTPUT_DIR}${NC}"
+  echo -e "${GREEN}========================================${NC}"
+
 }