Revert "Replace all [ condition ] && action with if-then-fi for some shells treat those incorrectly with 'set -e'"

This reverts commit f27ad4e5b5897d3f046c5b8ae70cdd031827f4a6.