Refactor code out.

fyne-io · Jan 12, 2023 · b1e4001 · b1e4001
1 parent 1ee2931
commit b1e4001
Showing 1 changed file with 22 additions and 12 deletions.
diff --git a/cmd/fyne/internal/commands/build.go b/cmd/fyne/internal/commands/build.go
@@ -197,18 +197,9 @@ func (b *Builder) build() error {
 		}
 	}
 
-	srcdir := b.srcdir
-	if b.goPackage != "" {
-		if strings.HasPrefix(b.goPackage, "./") {
-			srcdir = filepath.Join(srcdir, b.goPackage)
-		} else {
-			// get the output of go env GOROOT
-			goroot, err := fyneGoModRunner.runOutput("env", "GOROOT")
-			if err != nil {
-				return err
-			}
-			srcdir = filepath.Join(strings.TrimSpace(string(goroot)), "src", b.goPackage)
-		}
+	srcdir, err := b.computeSrcDir(fyneGoModRunner)
+	if err != nil {
+		return err
 	}
 
 	if b.icon == "" {
@@ -296,6 +287,25 @@ func (b *Builder) build() error {
 	return err
 }
 
+func (b *Builder) computeSrcDir(fyneGoModRunner runner) (string, error) {
+	if b.goPackage == "" {
+		return b.srcdir, nil
+	}
+
+	srcdir := b.srcdir
+	if strings.HasPrefix(b.goPackage, "./") {
+		srcdir = filepath.Join(srcdir, b.goPackage)
+	} else {
+		// get the output of go env GOROOT
+		goroot, err := fyneGoModRunner.runOutput("env", "GOROOT")
+		if err != nil {
+			return "", err
+		}
+		srcdir = filepath.Join(strings.TrimSpace(string(goroot)), "src", b.goPackage)
+	}
+	return srcdir, nil
+}
+
 func createMetadataInitFile(srcdir string, app *appData) (func(), error) {
 	data, err := metadata.LoadStandard(srcdir)
 	if err == nil {