Skip to content

Commit 641f16b

Browse files
committed
Factor out extract()
1 parent a611769 commit 641f16b

File tree

1 file changed

+28
-25
lines changed

1 file changed

+28
-25
lines changed

go/extractor/cli/go-autobuilder/go-autobuilder.go

Lines changed: 28 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -557,6 +557,33 @@ func installDependencies(depMode DependencyInstallerMode) {
557557
util.RunCmd(install)
558558
}
559559

560+
func extract(depMode DependencyInstallerMode, modMode ModMode) {
561+
extractor, err := util.GetExtractorPath()
562+
if err != nil {
563+
log.Fatalf("Could not determine path of extractor: %v.\n", err)
564+
}
565+
566+
cwd, err := os.Getwd()
567+
if err != nil {
568+
log.Fatalf("Unable to determine current directory: %s\n", err.Error())
569+
}
570+
571+
extractorArgs := []string{}
572+
if depMode == GoGetWithModules {
573+
extractorArgs = append(extractorArgs, modMode.argsForGoVersion(getEnvGoSemVer())...)
574+
}
575+
extractorArgs = append(extractorArgs, "./...")
576+
577+
log.Printf("Running extractor command '%s %v' from directory '%s'.\n", extractor, extractorArgs, cwd)
578+
cmd := exec.Command(extractor, extractorArgs...)
579+
cmd.Stdout = os.Stdout
580+
cmd.Stderr = os.Stderr
581+
err = cmd.Run()
582+
if err != nil {
583+
log.Fatalf("Extraction failed: %s\n", err.Error())
584+
}
585+
}
586+
560587
func main() {
561588
if len(os.Args) > 1 {
562589
usage()
@@ -637,29 +664,5 @@ func main() {
637664
}
638665
}
639666

640-
// extract
641-
extractor, err := util.GetExtractorPath()
642-
if err != nil {
643-
log.Fatalf("Could not determine path of extractor: %v.\n", err)
644-
}
645-
646-
cwd, err := os.Getwd()
647-
if err != nil {
648-
log.Fatalf("Unable to determine current directory: %s\n", err.Error())
649-
}
650-
651-
extractorArgs := []string{}
652-
if depMode == GoGetWithModules {
653-
extractorArgs = append(extractorArgs, modMode.argsForGoVersion(getEnvGoSemVer())...)
654-
}
655-
extractorArgs = append(extractorArgs, "./...")
656-
657-
log.Printf("Running extractor command '%s %v' from directory '%s'.\n", extractor, extractorArgs, cwd)
658-
cmd := exec.Command(extractor, extractorArgs...)
659-
cmd.Stdout = os.Stdout
660-
cmd.Stderr = os.Stderr
661-
err = cmd.Run()
662-
if err != nil {
663-
log.Fatalf("Extraction failed: %s\n", err.Error())
664-
}
667+
extract(depMode, modMode)
665668
}

0 commit comments

Comments
 (0)