If you aren't using GNU coreutils, chances are that your basename
doesn't know about the -s argument. Luckily for us, basename does what
we need it do even without the -s argument.

Change-Id: I8b81a429bb037b997ee6640ff8a2b5e860962bb7