replace test ... -o ... with test ... || test ... and test ... -a ... with test ... && test ...
This commit was SVN r31641.