Bash: Check for diffs, and only open the merge tool if diffs are found.

diffmerge.sh

#!/bin/bash

#
# Check for diffs, and only open the merge tool if diffs are found.
#

dir=$FIRSTDIRECTORY
dir2=$SECONDDIRECTORY

cd "$dir"
declare -a files=($(ls -d *))

for file in "${files[@]}"; do
    if [ ! -f "$dir2/$file" ]; then
        echo "Copying $dir2/$file"
        cp $dir/$file $dir2/$file
    else
        # Basic Diffing
        diffresult=$(diff --ignore-space-change "$dir/$file" "$dir2/$file")
        if [ "$diffresult" != "" ]; then
            # Interactive merge for conflicts
            ksdiff --wait "$dir/$file" "$dir2/$file" &
            PID=$!
        fi
    fi

    if [ "$PID" != "" ]; then
        wait $PID
    fi
    PID=""
done