Modifying build script to trim spaces as well.