Update script.sh

script.sh

@@ -287,6 +287,58 @@ provisioning_print_end() {
     echo ""
 }
 
+provisioning_step2_nodes() {
+    log_step "2" "安裝節點與套件"
+    
+    if [ ${#NODES[@]} -gt 0 ]; then
+        cd "${COMFYUI_DIR}/custom_nodes" || exit 1
+        log_info "並行安裝 ${#NODES[@]} 個節點..."
+        
+        MAX_PARALLEL=2
+        for node in "${NODES[@]}"; do
+            while [ $(jobs -r | wc -l) -ge $MAX_PARALLEL ]; do
+                sleep 1
+            done
+            install_node "$node" &
+        done
+        wait
+        
+        log_success "節點安裝完成"
+        cd "${COMFYUI_DIR}" || exit 1
+    fi
+
+    if [ ${#PIP_PACKAGES[@]} -gt 0 ]; then
+        log_info "安裝額外的 Python 套件..."
+        $PIP_BIN install -q --no-cache-dir "${PIP_PACKAGES[@]}" 2>&1 | grep -v "Requirement already satisfied" || true
+    fi
+}
+
+provisioning_step3_downloads() {
+    log_step "3" "下載模型與工作流文件"
+    
+    download_to_directory "${COMFYUI_DIR}/models/checkpoints" "${CHECKPOINT_MODELS[@]}"
+    download_to_directory "${COMFYUI_DIR}/models/clip_vision" "${CLIP_VISION_MODELS[@]}"
+    download_to_directory "${COMFYUI_DIR}/models/ipadapter" "${IPADAPTER_MODELS[@]}"
+    download_to_directory "${COMFYUI_DIR}/models/sams" "${SAM_MODELS[@]}"
+    download_to_directory "${COMFYUI_DIR}/models/ultralytics/bbox" "${ULTRALYTICS_BBOX_MODELS[@]}"
+    download_to_directory "${COMFYUI_DIR}/models/upscale_models" "${ESRGAN_MODELS[@]}"
+
+    if [ ${#WORKFLOWS[@]} -gt 0 ]; then
+        log_info "下載工作流文件..."
+        mkdir -p "${COMFYUI_DIR}/user/default/workflows"
+        local MAX_PARALLEL=3
+        for workflow_url in "${WORKFLOWS[@]}"; do
+            while [ $(jobs -r | wc -l) -ge $MAX_PARALLEL ]; do
+                sleep 1
+            done
+            local workflow_name
+            workflow_name=$(basename "$workflow_url" | sed 's/?.*//')
+            download_file "${COMFYUI_DIR}/user/default/workflows/${workflow_name}" "$workflow_url" &
+        done
+        wait
+    fi
+}
+
 START_TIME=$(date +%s)
 log_info "開始時間: $(date)"
 provisioning_print_header
@@ -297,7 +349,7 @@ log_step "1" "安裝系統套件 (aria2)"
 
 if ! command -v aria2c >/dev/null 2>&1; then
     log_info "aria2 未安裝，開始安裝..."
-    if command -v sudo &>/dev/null && sudo -n true 2>&/dev/null; then
+    if command -v sudo &>/dev/null && sudo -n true 2>/dev/null; then
         sudo apt-get update -qq
         sudo apt-get install -y -qq aria2
         log_success "aria2 安裝完成"
@@ -308,53 +360,10 @@ else
     log_success "aria2 已安裝，跳過"
 fi
 
-log_step "2" "安裝節點與套件"
-
-if [ ${#NODES[@]} -gt 0 ]; then
-    cd "${COMFYUI_DIR}/custom_nodes" || exit 1
-    log_info "並行安裝 ${#NODES[@]} 個節點..."
-    
-    MAX_PARALLEL=2
-    for node in "${NODES[@]}"; do
-        while [ $(jobs -r | wc -l) -ge $MAX_PARALLEL ]; do
-            sleep 1
-        done
-        install_node "$node" &
-    done
-    wait
-    
-    log_success "節點安裝完成"
-    cd "${COMFYUI_DIR}" || exit 1
-fi
-
-if [ ${#PIP_PACKAGES[@]} -gt 0 ]; then
-    log_info "安裝額外的 Python 套件..."
-    $PIP_BIN install -q --no-cache-dir "${PIP_PACKAGES[@]}" 2>&1 | grep -v "Requirement already satisfied" || true
-fi
-
-log_step "3" "下載模型文件"
-
-download_to_directory "${COMFYUI_DIR}/models/checkpoints" "${CHECKPOINT_MODELS[@]}"
-download_to_directory "${COMFYUI_DIR}/models/clip_vision" "${CLIP_VISION_MODELS[@]}"
-download_to_directory "${COMFYUI_DIR}/models/ipadapter" "${IPADAPTER_MODELS[@]}"
-download_to_directory "${COMFYUI_DIR}/models/sams" "${SAM_MODELS[@]}"
-download_to_directory "${COMFYUI_DIR}/models/ultralytics/bbox" "${ULTRALYTICS_BBOX_MODELS[@]}"
-download_to_directory "${COMFYUI_DIR}/models/upscale_models" "${ESRGAN_MODELS[@]}"
-
-if [ ${#WORKFLOWS[@]} -gt 0 ]; then
-    log_info "下載工作流文件..."
-    mkdir -p "${COMFYUI_DIR}/user/default/workflows"
-    local MAX_PARALLEL=3
-    for workflow_url in "${WORKFLOWS[@]}"; do
-        while [ $(jobs -r | wc -l) -ge $MAX_PARALLEL ]; do
-            sleep 1
-        done
-        local workflow_name
-        workflow_name=$(basename "$workflow_url" | sed 's/?.*//')
-        download_file "${COMFYUI_DIR}/user/default/workflows/${workflow_name}" "$workflow_url" &
-    done
-    wait
-fi
+# 步驟 2 (安裝節點) 與 步驟 3 (下載模型) 並行執行
+provisioning_step2_nodes &
+provisioning_step3_downloads &
+wait
 
 log_step "4" "驗證下載完整性"