X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/d3841f6869a8c6ae667df0288a5c88da6d830a6e..3993c04f1811a28399adc350511c4397e3d15321:/lib/install/deps.go diff --git a/lib/install/deps.go b/lib/install/deps.go index 6dd28d6cec..1d3cc09275 100644 --- a/lib/install/deps.go +++ b/lib/install/deps.go @@ -29,6 +29,7 @@ import ( var Command cmd.Handler = &installCommand{} const devtestDatabasePassword = "insecure_arvados_test" +const goversion = "1.17.1" type installCommand struct { ClusterType string @@ -57,17 +58,11 @@ func (inst *installCommand) RunCommand(prog string, args []string, stdin io.Read flags.StringVar(&inst.SourcePath, "source", "/arvados", "source tree location (required for -type=package)") flags.StringVar(&inst.PackageVersion, "package-version", "0.0.0", "version string to embed in executable files") flags.BoolVar(&inst.EatMyData, "eatmydata", false, "use eatmydata to speed up install") - err = flags.Parse(args) - if err == flag.ErrHelp { - err = nil - return 0 - } else if err != nil { - return 2 + + if ok, code := cmd.ParseFlags(flags, prog, args, "", stderr); !ok { + return code } else if *versionFlag { return cmd.Version.RunCommand(prog, args, stdin, stdout, stderr) - } else if len(flags.Args()) > 0 { - err = fmt.Errorf("unrecognized command line arguments: %v", flags.Args()) - return 2 } var dev, test, prod, pkg bool @@ -245,7 +240,6 @@ make install } if !prod { - goversion := "1.16.3" if havegoversion, err := exec.Command("/usr/local/bin/go", "version").CombinedOutput(); err == nil && bytes.HasPrefix(havegoversion, []byte("go version go"+goversion+" ")) { logger.Print("go " + goversion + " already installed") } else {