-for f in $components; do
- if [ $(stat -c %Y $f) -lt $target_mod ]; then
- nawk "/+++ $f +++/, /--- $f ---/" $target | grep -v "+++ $f +++" | grep -v "\--- $f ---" > $f
- else
- merge_required=true
-done
+ if $update_required; then
+ echo "$0 - update $f from $target"
+ sanity=$(egrep "(+++ $f +++)|(--- $f ---)" $target | wc -l)
+ if [ $sanity -ne 2 ]; then
+ $(echo "$0 - $target does not have markers for $f in it!") 1>&2
+ exit 1
+ fi
+ cp $f $f~
+ new_contents=$(nawk "/+++ $f +++/, /--- $f ---/" $target | grep -v "+++ $f +++" | grep -v "\--- $f ---")
+
+ echo "$new_contents" > $f
+ else
+ echo "$0 - $f is newer than $target"
+ merge_required=true
+ fi
+ done
+fi