Fix issue where ${DIRSCRIPT} wasn't exanded

Change-Id: Ie41aa7f941f8883f72aaeb666ad1e16ca2a4a3c2