FIX don't shell out when you can mv

fixes #7041