apt-ostree/simple-fix.sh

#!/bin/bash

echo "=== SIMPLE FIX: Get Back to Working Code ==="
echo ""

# Colors
GREEN='\033[0;32m'
RED='\033[0;31m'
YELLOW='\033[1;33m'
NC='\033[0m'

echo "🎯 STEP 1: Check what's broken right now"
echo "========================================"

# Check if OCI is broken
if grep -q "// TODO: OCI image building not yet implemented" src/main.rs 2>/dev/null; then
    echo "❌ OCI is BROKEN (commented out)"
    OCI_BROKEN=true
else
    echo "✅ OCI looks OK"
    OCI_BROKEN=false
fi

# Check if daemon exists
if [ -f "/usr/libexec/apt-ostreed" ]; then
    echo "✅ Daemon binary exists"
else
    echo "❌ Daemon binary missing"
fi

echo ""
echo "🎯 STEP 2: Find the last working commit"
echo "======================================="

echo "Looking for commits with 'daemon' or 'fix' in the message..."
WORKING_COMMIT=$(git log --oneline --grep="daemon\|fix\|working" --all 2>/dev/null | head -1 | cut -d' ' -f1)

if [ -n "$WORKING_COMMIT" ]; then
    echo "✅ Found potential working commit: $WORKING_COMMIT"
else
    echo "❌ No obvious working commit found"
    echo "Let's try a different approach..."
    
    # Look for commits that don't have the broken TODO
    echo "Looking for commits without the broken TODO..."
    WORKING_COMMIT=$(git log --oneline --all 2>/dev/null | head -10 | while read commit; do
        COMMIT_HASH=$(echo $commit | cut -d' ' -f1)
        if git show $COMMIT_HASH:src/main.rs 2>/dev/null | grep -q "// TODO: OCI image building not yet implemented"; then
            echo "BROKEN: $COMMIT_HASH"
        else
            echo "WORKING: $COMMIT_HASH"
        fi
    done | grep "WORKING" | head -1 | cut -d' ' -f2)
fi

echo ""
echo "🎯 STEP 3: Restore working code"
echo "==============================="

if [ -n "$WORKING_COMMIT" ]; then
    echo "Found working commit: $WORKING_COMMIT"
    echo ""
    echo "Do you want to restore this commit? (y/n)"
    read -r response
    if [[ "$response" =~ ^[Yy]$ ]]; then
        echo "Restoring working commit..."
        git checkout -b working-restore $WORKING_COMMIT
        echo "✅ Switched to working commit"
    else
        echo "Skipping restore"
    fi
else
    echo "❌ Couldn't find working commit automatically"
    echo ""
    echo "🎯 STEP 4: Manual fix"
    echo "===================="
    echo "Let's fix the OCI implementation manually..."
    
    # Backup current file
    cp src/main.rs src/main.rs.backup
    echo "✅ Created backup: src/main.rs.backup"
    
    # Fix the OCI implementation
    echo "Fixing OCI implementation..."
    sed -i '/ComposeSubcommand::BuildImage { source, output, format } => {/,/^                },$/c\
                ComposeSubcommand::BuildImage { source, output, format } => {\
                    info!("Building OCI image from source: {} -> {} ({})", source, output, format);\
                    \
                    // Create OCI image builder\
                    let oci_builder = crate::oci::OciImageBuilder::new().await?;\
                    \
                    // Build the image\
                    match oci_builder.build_image_from_commit(source, &output, &format).await {\
                        Ok(image_path) => {\
                            println!("OCI image created successfully: {}", image_path);\
                        },\
                        Err(e) => {\
                            eprintln!("Failed to create OCI image: {}", e);\
                            return Err(e.into());\
                        }\
                    }\
                },' src/main.rs
    
    echo "✅ Fixed OCI implementation"
fi

echo ""
echo "🎯 STEP 5: Rebuild and test"
echo "==========================="

echo "Building project..."
if cargo build --release; then
    echo "✅ Build successful"
    
    echo "Installing binaries..."
    sudo cp target/release/apt-ostree /usr/bin/apt-ostree
    sudo cp target/release/apt-ostreed /usr/libexec/apt-ostreed
    echo "✅ Binaries installed"
    
    echo ""
    echo "🎯 STEP 6: Test the fix"
    echo "======================"
    
    echo "Testing compose command..."
    if apt-ostree compose build-image --help 2>/dev/null; then
        echo "✅ Compose command working!"
        echo ""
        echo "🎉 SUCCESS! Your working code is restored!"
        echo ""
        echo "You can now use:"
        echo "  apt-ostree compose build-image <source> --output <name> --format oci"
    else
        echo "❌ Compose command still not working"
        echo "Let's try a different approach..."
    fi
else
    echo "❌ Build failed"
    echo "Restoring backup..."
    cp src/main.rs.backup src/main.rs
    echo "✅ Restored backup"
fi

echo ""
echo "🎯 SUMMARY"
echo "=========="
echo "If this worked, you're back to working code!"
echo "If not, we can try other approaches."
echo ""
echo "To undo changes:"
echo "  git checkout main  # or whatever your original branch was"
echo "  cp src/main.rs.backup src/main.rs  # if we made manual changes"