Simplify the construct for guarding against empty output string.
For Travis CI - switch CI build to use Raspberry-Pi build environment.