Fix if condition checks.

|| and && don't work the way one would expect. Use -a and -o
instead.
Merge pull request #19 from smspillaz/polysquare-ci-scripts.item_19

Fix if condition checks.