Fix build version, set as variable in app for now

1 file · +9 -10

M internal/app/app.go +9 -10


@@ -19,13 +19,6 @@ var (
19	19		BuildVersion = "0.0.2"
20	20		)
21	21
22		-	func init() {
23		-	appEnv = os.Getenv("APP_ENV")
24		-	if appEnv == "" {
25		-	appEnv = "prod" // Default to "prod" if APP_ENV is not set
26		-	}
27		-	}
28		-
29	22		type App struct {
30	23		TemplateFS fs.FS
31	24		PublicFS fs.FS

@@ -76,9 +69,15 @@ func LoadConfig() (AppConfig, error) {
76	69		var config AppConfig
77	70		configDir, configFile := getConfigFile()
78	71		fsys := os.DirFS(configDir)
79		-	BuildVersion = config.General.BuildVersion // Use directory path here
80		-	err := parser.OpenYamlFile(fsys, configFile, &config) // Assuming it doesn't need the last argument
81		-	return config, err
	72	+	err := parser.OpenYamlFile(fsys, configFile, &config)
	73	+	if err != nil {
	74	+	return config, err
	75	+	}
	76	+
	77	+	// Set the BuildVersion from the global BuildVersion
	78	+	config.General.BuildVersion = BuildVersion
	79	+
	80	+	return config, nil
82	81		}
83	82
84	83		func NewApp() *App {

 	BuildVersion     = "0.0.2"
 )
-func init() {
-	appEnv = os.Getenv("APP_ENV")
-	if appEnv == "" {
-		appEnv = "prod" // Default to "prod" if APP_ENV is not set
-	}
-}
 type App struct {
 	TemplateFS      fs.FS
 	PublicFS        fs.FS
 	var config AppConfig
 	configDir, configFile := getConfigFile()
 	fsys := os.DirFS(configDir)
-	BuildVersion = config.General.BuildVersion            // Use directory path here
+	err := parser.OpenYamlFile(fsys, configFile, &config)
-	err := parser.OpenYamlFile(fsys, configFile, &config) // Assuming it doesn't need the last argument
+	if err != nil {
-	return config, err
+		return config, err
+	}
+	// Set the BuildVersion from the global BuildVersion
+	config.General.BuildVersion = BuildVersion
+	return config, nil
 }
 func NewApp() *App {