On first run, tool patching fails because diff is nonempty

The diff (for debugging) is correctly nonempty, but its return code is nonzero and causes the script to abort because of a recent change to add set -e in the right place.