Upload PackreatorComfyUi.sh

PackreatorComfyUi.sh

@@ -29,7 +29,7 @@ readonly DOWNLOAD_FILES=(
     "https://civitai.com/api/download/models/1761560?type=Model&format=SafeTensor&size=pruned&fp=fp16|checkpoints|"
     "https://civitai.com/api/download/models/1268294?type=Model&format=SafeTensor|loras|"
     "https://civitai.com/api/download/models/1715330?type=Model&format=SafeTensor|loras|"
-    "https://civitai.com/api/download/models/1499397?type=Model&format=SafeTensor|loras|" # NOVO LORA ADICIONADO
+    "https://civitai.com/api/download/models/1499397?type=Model&format=SafeTensor|loras|"
     "https://huggingface.co/Kim2091/AnimeSharpV3/resolve/main/2x-AnimeSharpV3.pth|upscale_models|2x-AnimeSharpV3.pth"
     "https://huggingface.co/adbrasi/testedownload/resolve/main/99coins_anime_girl_face_m_seg.pt|ultralytics/bbox|99coins_anime_girl_face_m_seg.pt"
 )
@@ -198,7 +198,6 @@ install_comfy_cli() {
 install_comfyui_core() {
     log_info "Installing ComfyUI core..."
     
-    # MODIFICADO: Adicionado --fast-deps
     comfy --workspace "$COMFY_INSTALL_DIR" --skip-prompt install --nvidia --fast-deps || {
         log_error "Failed to install ComfyUI core"
         exit 1
@@ -230,13 +229,11 @@ create_model_directories() {
 install_custom_nodes() {
     log_info "Installing custom nodes..."
     
-    # MODIFICADO: Adicionado instalação via registro
     log_info "Installing custom node from registry: civicomfy"
     comfy --workspace "$COMFY_INSTALL_DIR" node registry-install civicomfy || {
         log_warning "Failed to install custom node from registry: civicomfy"
     }
 
-    # MODIFICADO: Nova lista de nós a partir do Git
     for node_url in "${CUSTOM_NODES[@]}"; do
         log_info "Installing custom node from Git: $node_url"
         comfy --workspace "$COMFY_INSTALL_DIR" node install "$node_url" || {
@@ -290,16 +287,20 @@ download_file() {
     
     if ! $success && command_exists curl; then
         log_warning "Using curl fallback for $url"
-        if [ -n "$filename" ]; {
-            download_cmd="curl -L -C - -o \"$target_dir/$filename\" \"$url\"";
-        } else {
+        # =================== BLOCO CORRIGIDO ===================
+        if [ -n "$filename" ]; then
+            download_cmd="curl -L -C - -o \"$target_dir/$filename\" \"$url\""
+        else
             if curl --help 2>/dev/null | grep -q "output-dir"; then
-                download_cmd="curl -L -J -O --output-dir \"$target_dir\" \"$url\"";
+                download_cmd="curl -L -J -O --output-dir \"$target_dir\" \"$url\""
             else
-                local fallback_name; fallback_name=$(basename "$url" | cut -d'?' -f1); [ -z "$fallback_name" ] && fallback_name="downloaded_file"
-                download_cmd="curl -L -C - -o \"$target_dir/$fallback_name\" \"$url\"";
-            fi;
-        }
+                local fallback_name
+                fallback_name=$(basename "$url" | cut -d'?' -f1)
+                [ -z "$fallback_name" ] && fallback_name="downloaded_file"
+                download_cmd="curl -L -C - -o \"$target_dir/$fallback_name\" \"$url\""
+            fi
+        fi
+        # ======================================================
         if eval "$download_cmd"; then success=true; fi
     fi
     
@@ -359,7 +360,7 @@ download_all_files() {
 }
 
 # ============================================================================
-# WORKFLOW DOWNLOAD (NOVA FUNÇÃO)
+# WORKFLOW DOWNLOAD
 # ============================================================================
 
 download_workflow() {
@@ -368,27 +369,20 @@ download_workflow() {
     
     local success=false
     
-    # Tenta diferentes métodos de download
     if command_exists wget; then
-        if wget -q --show-progress -O "$WORKFLOW_FILE" "$WORKFLOW_URL"; then
-            success=true
-        fi
-    elif command_exists curl; then
-        if curl -L -o "$WORKFLOW_FILE" "$WORKFLOW_URL"; then
-            success=true
-        fi
-    elif command_exists aria2c; then
-        # aria2c precisa do nome do arquivo e diretório separados
-        if aria2c -q -o "$(basename "$WORKFLOW_FILE")" -d "$(dirname "$WORKFLOW_FILE")" "$WORKFLOW_URL"; then
-            success=true
-        fi
-    else
-        log_error "Nenhuma ferramenta de download disponível (wget, curl ou aria2c)."
-        exit 1
+        if wget -q --show-progress -O "$WORKFLOW_FILE" "$WORKFLOW_URL"; then success=true; fi
+    fi
+    
+    if ! $success && command_exists curl; then
+        if curl -L -o "$WORKFLOW_FILE" "$WORKFLOW_URL"; then success=true; fi
+    fi
+    
+    if ! $success && command_exists aria2c; then
+        if aria2c -q -o "$(basename "$WORKFLOW_FILE")" -d "$(dirname "$WORKFLOW_FILE")" "$WORKFLOW_URL"; then success=true; fi
     fi
     
     if ! $success; then
-        log_error "Falha ao baixar o arquivo do workflow."
+        log_error "Nenhuma ferramenta de download (wget, curl, aria2c) funcionou ou está disponível."
         exit 1
     fi
     
@@ -401,7 +395,7 @@ download_workflow() {
 }
 
 # ============================================================================
-# DEPENDÊNCIAS DO WORKFLOW (NOVA FUNÇ��O)
+# WORKFLOW DEPENDENCIES
 # ============================================================================
 
 install_workflow_dependencies() {
@@ -412,7 +406,6 @@ install_workflow_dependencies() {
         return 1
     fi
     
-    # Usa o workspace correto para instalar as dependências
     comfy --workspace "$COMFY_INSTALL_DIR" node install-deps --workflow="$WORKFLOW_FILE" || {
         log_warning "Algumas dependências do workflow podem ter falhado ao instalar."
         log_info "Isso pode ser normal. O ComfyUI mostrará os nós ausentes ao iniciar."
@@ -430,7 +423,6 @@ launch_comfyui() {
     log_info "Launching ComfyUI on port 8818..."
     log_info "ComfyUI will be accessible at: http://0.0.0.0:8818"
     
-    # Launch ComfyUI
     exec comfy --workspace "$COMFY_INSTALL_DIR" launch -- --fast --listen 0.0.0.0 --port 8818
 }
 
@@ -442,37 +434,17 @@ main() {
     log_info "Starting ComfyUI automated setup..."
     log_info "========================================"
     
-    # Step 1: Environment Detection
     detect_environment
-    
-    # Step 2: Permission Setup
     setup_permissions
-    
-    # Step 3: System Dependencies
     install_system_dependencies
-    
-    # Step 4: Install comfy-cli
     install_comfy_cli
-    
-    # Step 5: Install ComfyUI Core
     install_comfyui_core
-    
-    # Step 6: Create Directory Structure
     create_model_directories
-    
-    # Step 7: Install Custom Nodes
     install_custom_nodes
-    
-    # Step 8: Download Files in Parallel
     download_all_files
-    
-    # Step 9: Download Workflow
     download_workflow
-    
-    # Step 10: Install Workflow Dependencies
     install_workflow_dependencies
     
-    # Step 11: Launch ComfyUI
     log_info "========================================"
     log_info "Setup completed successfully!"
     log_info "========================================"
@@ -483,8 +455,6 @@ main() {
 # SCRIPT EXECUTION
 # ============================================================================
 
-# Trap to handle script interruption
 trap 'log_error "Script interrupted"; exit 1' INT TERM
 
-# Run main function
 main "$@"