Fix init sequence bug for embedded assets

Author: GeertJohan

cmd/build.go

@@ -2,13 +2,14 @@ package cmd
 
 import (
 	"fmt"
-	"github.com/go-flutter-desktop/hover/internal/androidmanifest"
 	"os"
 	"os/exec"
 	"path/filepath"
 	"runtime"
 	"strings"
 
+	"github.com/go-flutter-desktop/hover/internal/androidmanifest"
+
 	"github.com/hashicorp/go-version"
 	"github.com/otiai10/copy"
 	"github.com/spf13/cobra"
@@ -223,7 +224,7 @@ func assertTargetFileExists(targetFilename string) {
 		if targetFilename == config.BuildTargetDefault {
 			log.Warnf("Let hover add the \"lib/main_desktop.dart\" file? ")
 			if askForConfirmation() {
-				fileutils.CopyAsset("app/main_desktop.dart", filepath.Join("lib", "main_desktop.dart"), fileutils.AssetsBox)
+				fileutils.CopyAsset("app/main_desktop.dart", filepath.Join("lib", "main_desktop.dart"), fileutils.AssetsBox())
 				log.Infof("Target file \"lib/main_desktop.dart\" has been created.")
 				log.Infof("       Depending on your project, you might want to tweak it.")
 				return

cmd/init-plugin.go

@@ -48,17 +48,17 @@ var createPluginCmd = &cobra.Command{
 			"urlVSCRepo": vcsPath,
 		}
 
-		fileutils.ExecuteTemplateFromAssetsBox("plugin/plugin.go.tmpl", filepath.Join(build.BuildPath, "plugin.go"), fileutils.AssetsBox, templateData)
-		fileutils.ExecuteTemplateFromAssetsBox("plugin/README.md.tmpl", filepath.Join(build.BuildPath, "README.md"), fileutils.AssetsBox, templateData)
-		fileutils.ExecuteTemplateFromAssetsBox("plugin/import.go.tmpl.tmpl", filepath.Join(build.BuildPath, "import.go.tmpl"), fileutils.AssetsBox, templateData)
+		fileutils.ExecuteTemplateFromAssetsBox("plugin/plugin.go.tmpl", filepath.Join(build.BuildPath, "plugin.go"), fileutils.AssetsBox(), templateData)
+		fileutils.ExecuteTemplateFromAssetsBox("plugin/README.md.tmpl", filepath.Join(build.BuildPath, "README.md"), fileutils.AssetsBox(), templateData)
+		fileutils.ExecuteTemplateFromAssetsBox("plugin/import.go.tmpl.tmpl", filepath.Join(build.BuildPath, "import.go.tmpl"), fileutils.AssetsBox(), templateData)
 
 		dlibPath := filepath.Join(build.BuildPath, "dlib")
 		err = os.Mkdir(dlibPath, 0775)
 		if err != nil {
 			log.Errorf("Failed to create '%s' directory: %v", dlibPath, err)
 			os.Exit(1)
 		}
-		fileutils.ExecuteTemplateFromAssetsBox("plugin/README.md.dlib.tmpl", filepath.Join(dlibPath, "README.md"), fileutils.AssetsBox, templateData)
+		fileutils.ExecuteTemplateFromAssetsBox("plugin/README.md.dlib.tmpl", filepath.Join(dlibPath, "README.md"), fileutils.AssetsBox(), templateData)
 
 		platforms := []string{"darwin", "linux", "windows"}
 		for _, platform := range platforms {

cmd/init.go

@@ -60,11 +60,11 @@ var initCmd = &cobra.Command{
 			os.Exit(1)
 		}
 
-		fileutils.CopyAsset("app/main.go", filepath.Join(desktopCmdPath, "main.go"), fileutils.AssetsBox)
-		fileutils.CopyAsset("app/options.go", filepath.Join(desktopCmdPath, "options.go"), fileutils.AssetsBox)
-		fileutils.CopyAsset("app/icon.png", filepath.Join(desktopAssetsPath, "icon.png"), fileutils.AssetsBox)
-		fileutils.CopyAsset("app/gitignore", filepath.Join(build.BuildPath, ".gitignore"), fileutils.AssetsBox)
-		fileutils.CopyAsset("app/hover.yaml", filepath.Join(build.BuildPath, "hover.yaml"), fileutils.AssetsBox)
+		fileutils.CopyAsset("app/main.go", filepath.Join(desktopCmdPath, "main.go"), fileutils.AssetsBox())
+		fileutils.CopyAsset("app/options.go", filepath.Join(desktopCmdPath, "options.go"), fileutils.AssetsBox())
+		fileutils.CopyAsset("app/icon.png", filepath.Join(desktopAssetsPath, "icon.png"), fileutils.AssetsBox())
+		fileutils.CopyAsset("app/gitignore", filepath.Join(build.BuildPath, ".gitignore"), fileutils.AssetsBox())
+		fileutils.CopyAsset("app/hover.yaml", filepath.Join(build.BuildPath, "hover.yaml"), fileutils.AssetsBox())
 
 		initializeGoModule(projectPath)
 		log.Printf("Available plugin for this project:")

cmd/packaging/packaging.go

@@ -154,7 +154,7 @@ func (t *packagingTask) init(ignoreAlreadyExists bool) {
 				log.Errorf("Failed to create directory %s: %v", filepath.Dir(destinationFile), err)
 				os.Exit(1)
 			}
-			fileutils.ExecuteTemplateFromAssetsBox(fmt.Sprintf("packaging/%s", sourceFile), destinationFile, fileutils.AssetsBox, templateData)
+			fileutils.ExecuteTemplateFromAssetsBox(fmt.Sprintf("packaging/%s", sourceFile), destinationFile, fileutils.AssetsBox(), templateData)
 		}
 		log.Infof("go/packaging/%s has been created. You can modify the configuration files and add it to git.", t.packagingFormatName)
 		log.Infof(fmt.Sprintf("You now can package the %s using `%s`", strings.Split(t.packagingFormatName, "-")[0], log.Au().Magenta("hover build "+t.packagingFormatName)))

internal/fileutils/assets.go

@@ -3,19 +3,26 @@ package fileutils
 
 import (
 	"os"
+	"sync"
 
 	rice "github.com/GeertJohan/go.rice"
 	"github.com/go-flutter-desktop/hover/internal/log"
 )
 
-// AssetsBox hover's assets box
-var AssetsBox *rice.Box
+var (
+	assetsBox     *rice.Box
+	assetsBoxOnce sync.Once
+)
 
-func init() {
-	var err error
-	AssetsBox, err = rice.FindBox("../../assets")
-	if err != nil {
-		log.Errorf("Failed to find hover assets: %v", err)
-		os.Exit(1)
-	}
+// AssetsBox hover's assets box
+func AssetsBox() *rice.Box {
+	assetsBoxOnce.Do(func() {
+		var err error
+		assetsBox, err = rice.FindBox("../../assets")
+		if err != nil {
+			log.Errorf("Failed to find hover assets: %v", err)
+			os.Exit(1)
+		}
+	})
+	return assetsBox
 }