Make the getopt version check agnostic of invocation name
Use a better check for whether to clone