fix: Dynamic box sizing, three-way merge, upgrade error detection, and bug fixes (v6)

Author: draphy

VERSION

@@ -1 +1 @@
-5
+6

update.sh

@@ -89,29 +89,37 @@ get_system_info() {
 show_system_status() {
     get_system_info
 
-    # Box width (inner content width = 49 chars)
-    local box_width=49
+    # Calculate dynamic box width based on content
+    local header="System Information"
+    local fedora_text="Fedora Version: $FEDORA_VERSION"
+    local kernel_text="Kernel: $KERNEL_VERSION"
+    local update_text="Last Package Change: $LAST_UPDATE"
 
-    echo -e "  ┌─────────────────────────────────────────────────┐"
-    echo -e "  │  ${BOLD}System Information${NC}                             │"
-    echo -e "  ├─────────────────────────────────────────────────┤"
+    # Find the longest line (add 4 for "  " padding on each side)
+    local max_len=${#header}
+    [ ${#fedora_text} -gt $max_len ] && max_len=${#fedora_text}
+    [ ${#kernel_text} -gt $max_len ] && max_len=${#kernel_text}
+    [ ${#update_text} -gt $max_len ] && max_len=${#update_text}
 
-    # Fedora Version line
-    local fedora_text="Fedora Version: $FEDORA_VERSION"
-    local fedora_pad=$((box_width - ${#fedora_text} - 2))
-    printf "  │  Fedora Version: ${GREEN}%s${NC}%*s│\n" "$FEDORA_VERSION" "$fedora_pad" ""
+    # Box width = max content + 4 (2 spaces padding each side)
+    local box_width=$((max_len + 4))
+    # Minimum width of 49 for aesthetics
+    [ $box_width -lt 49 ] && box_width=49
 
-    # Kernel line
-    local kernel_text="Kernel: $KERNEL_VERSION"
-    local kernel_pad=$((box_width - ${#kernel_text} - 2))
-    printf "  │  Kernel: ${CYAN}%s${NC}%*s│\n" "$KERNEL_VERSION" "$kernel_pad" ""
+    # Generate horizontal border
+    local border=""
+    for ((i=0; i<box_width; i++)); do border+="─"; done
 
-    # Last Package Change line
-    local update_text="Last Package Change: $LAST_UPDATE"
-    local update_pad=$((box_width - ${#update_text} - 2))
-    printf "  │  Last Package Change: ${YELLOW}%s${NC}%*s│\n" "$LAST_UPDATE" "$update_pad" ""
+    echo -e "  ┌${border}┐"
+    printf "  │  ${BOLD}%-$((box_width - 4))s${NC}  │\n" "$header"
+    echo -e "  ├${border}┤"
+
+    # Content lines with dynamic padding
+    printf "  │  Fedora Version: ${GREEN}%-$((box_width - 22))s${NC}  │\n" "$FEDORA_VERSION"
+    printf "  │  Kernel: ${CYAN}%-$((box_width - 14))s${NC}  │\n" "$KERNEL_VERSION"
+    printf "  │  Last Package Change: ${YELLOW}%-$((box_width - 28))s${NC}  │\n" "$LAST_UPDATE"
 
-    echo -e "  └─────────────────────────────────────────────────┘"
+    echo -e "  └${border}┘"
     echo ""
 }
 
@@ -847,9 +855,16 @@ handle_config_conflict() {
     # Use loop instead of recursion to avoid stack depth issues
     while true; do
         echo ""
-        echo -e "  ${YELLOW}╔═══════════════════════════════════════════════════════════╗${NC}"
-        printf "  ${YELLOW}║${NC}  Conflict in: ${BOLD}%-43s${NC}${YELLOW}║${NC}\n" "$config_name"
-        echo -e "  ${YELLOW}╚═══════════════════════════════════════════════════════════╝${NC}"
+        # Dynamic box width based on config name length
+        local label="Conflict in: $config_name"
+        local box_width=${#label}
+        [ $box_width -lt 55 ] && box_width=55  # Minimum width
+        box_width=$((box_width + 4))  # Add padding
+        local border=""
+        for ((i=0; i<box_width; i++)); do border+="═"; done
+        echo -e "  ${YELLOW}╔${border}╗${NC}"
+        printf "  ${YELLOW}║${NC}  Conflict in: ${BOLD}%-$((box_width - 18))s${NC}  ${YELLOW}║${NC}\n" "$config_name"
+        echo -e "  ${YELLOW}╚${border}╝${NC}"
         echo ""
 
         # Show diff summary (your version vs new version)