Making these scripts a bit more vcs agnostic