don't shell out for mv
Merge pull request #7046 from hayd/dont_shell_out

FIX don't shell out when you can mv