replace test -n ... && clauses with proper ifs
replace test -n ... && clauses with proper ifs

The version of this using test -n syntax didn't work in my chroot.

Review URL: http://codereview.chromium.org/2951007

trnubo/scripts,sigma/coreos-scripts,mischief/scripts,crawford/scripts,mischief/scripts,fivethreeo/scripts,gtank/scripts,fivethreeo/scripts,mjg59/scripts,vmware/coreos-scripts,gtank/scripts,endocode/scripts,glevand/coreos--scripts,crawford/scripts,smilart/scripts,mjg59/scripts,BugRoger/scripts,nicescale/scripts,mjg59/scripts,bcwaldon/coreos-scripts,vmware/coreos-scripts,BugRoger/scripts,sigma/coreos-scripts,glevand/coreos--scripts,andrejro/coreos--scripts,marineam/coreos-scripts,crawford/scripts,bcwaldon/coreos-scripts,smilart/scripts,zhang0137/scripts,sigma/coreos-scripts,endocode/scripts,trnubo/scripts,BugRoger/scripts,nicescale/scripts,coreos/scripts,fivethreeo/scripts,coreos/scripts,marineam/coreos-scripts,endocode/scripts,zhang0137/scripts,nicescale/scripts,andrejro/coreos--scripts,smilart/scripts,bcwaldon/coreos-scripts,andrejro/coreos--scripts,zhang0137/scripts,trnubo/scripts,vmware/coreos-scripts,gtank/scripts,marineam/coreos-scripts,mischief/scripts