fix: Correct box alignment and three-way merge for symlinked configs (v2)

Author: draphy

update.sh

@@ -777,10 +777,10 @@ three_way_merge() {
     local config_name="$1"   # e.g., "i3/config"
     local user_file="$2"     # User's current file
     local new_file="$3"      # New version from repo
-    local original_file="$4" # Original file (pre-update repo version)
+    local original_file="$4" # Original file (pre-update repo version, contains user's changes if any)
 
-    # If user file doesn't exist or is a symlink, just use new version
-    if [ ! -f "$user_file" ] || [ -L "$user_file" ]; then
+    # If user file doesn't exist, just use new version
+    if [ ! -f "$user_file" ] && [ ! -L "$user_file" ]; then
         return 0
     fi
 
@@ -789,7 +789,20 @@ three_way_merge() {
         return 1
     fi
 
-    # Check if user modified the file
+    # Handle symlinks: compare original (user's version before git reset) vs new
+    # If user_file is a symlink, the user was editing the repo file directly
+    # original_file contains what the user had, new_file has upstream changes
+    if [ -L "$user_file" ]; then
+        # Check if user modified the symlinked file (original vs new)
+        if diff -q "$original_file" "$new_file" >/dev/null 2>&1; then
+            # No difference - user didn't modify or changes are same as upstream
+            return 0
+        fi
+        # User had changes that differ from upstream - conflict!
+        return 1
+    fi
+
+    # For regular files: check if user modified
     if ! is_config_modified "$config_name" "$user_file"; then
         # Not modified, safe to replace
         return 0
@@ -824,6 +837,11 @@ handle_config_conflict() {
     local config_name="$1"
     local user_file="$2"
     local new_file="$3"
+    local original_file="$4"  # User's version saved before git reset
+
+    # Use original_file for comparison (user_file may be symlink pointing to new version)
+    local user_version="$original_file"
+    [ ! -f "$user_version" ] && user_version="$user_file"
 
     # Use loop instead of recursion to avoid stack depth issues
     while true; do
@@ -833,11 +851,11 @@ handle_config_conflict() {
         echo -e "  ${YELLOW}╚═══════════════════════════════════════════════════════════╝${NC}"
         echo ""
 
-        # Show diff summary
-        echo -e "  ${CYAN}Changes summary:${NC}"
-        diff --color=auto -u "$user_file" "$new_file" 2>/dev/null | head -30
+        # Show diff summary (your version vs new version)
+        echo -e "  ${CYAN}Changes summary (your version → new version):${NC}"
+        diff --color=auto -u "$user_version" "$new_file" 2>/dev/null | head -30
         local diff_lines
-        diff_lines=$(diff -u "$user_file" "$new_file" 2>/dev/null | wc -l)
+        diff_lines=$(diff -u "$user_version" "$new_file" 2>/dev/null | wc -l)
         if [ "$diff_lines" -gt 30 ]; then
             echo -e "  ${YELLOW}... ($((diff_lines - 30)) more lines)${NC}"
         fi
@@ -854,26 +872,34 @@ handle_config_conflict() {
 
         case "$choice" in
             1)
+                # Restore user's version (convert symlink to regular file if needed)
+                rm -f "$user_file" 2>/dev/null
+                cp "$user_version" "$user_file"
                 print_step "  Keeping your version of $config_name"
                 return 0
                 ;;
             2)
+                rm -f "$user_file" 2>/dev/null
                 cp "$new_file" "$user_file"
                 print_success "  Updated to new version: $config_name"
                 return 0
                 ;;
             3)
                 local backup_file="${user_file}.backup-$(date +%Y%m%d%H%M%S)"
-                cp "$user_file" "$backup_file"
+                cp "$user_version" "$backup_file"
+                rm -f "$user_file" 2>/dev/null
                 cp "$new_file" "$user_file"
                 print_success "  Updated $config_name (backup: $backup_file)"
                 return 0
                 ;;
             4)
-                diff --color=auto -u "$user_file" "$new_file" 2>/dev/null | less
+                diff --color=auto -u "$user_version" "$new_file" 2>/dev/null | less
                 # Loop continues to show menu again
                 ;;
             *)
+                # Restore user's version
+                rm -f "$user_file" 2>/dev/null
+                cp "$user_version" "$user_file"
                 print_step "  Keeping your version of $config_name"
                 return 0
                 ;;
@@ -1291,7 +1317,8 @@ do_draphyos_update() {
         for config_name in "${conflicts[@]}"; do
             local user_file="${config_map[$config_name]}"
             local new_file="$INSTALL_DIR/configs/$config_name"
-            handle_config_conflict "$config_name" "$user_file" "$new_file"
+            local original_file="$original_configs_dir/$config_name"
+            handle_config_conflict "$config_name" "$user_file" "$new_file" "$original_file"
         done
     fi
     echo ""