Add quotes where appropriate.
Use recommended bash syntax for boolean logic.