Merge branch 'main' of github.com:smarthome-go/smarthome

smarthome-go · Aug 25, 2022 · e7aa8c7 · e7aa8c7
2 parents 5a1ea3c + ad9f986
commit e7aa8c7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -15,7 +15,7 @@ tar = mkdir -p build && cd ../ && tar -cvzf ./$(appname)_$(1)_$(2).tar.gz $(work
 all:	linux
 
 # Setup dependencies for Go and NPM
-setup: deps
+setup:
 	cd web && npm i && npm run prepare
 
 deps:

diff --git a/core/config/config.go b/core/config/config.go
@@ -92,6 +92,6 @@ func createNewConfigFile() (Config, error) {
 	return config, nil
 }
 
-func GetConfig() Config {
-	return config
+func GetConfig() *Config {
+	return &config
 }
diff --git a/core/config/setup.go b/core/config/setup.go
@@ -96,7 +96,7 @@ func RunSetupStruct(setup SetupStruct) error {
 	}
 	// Initialize database (fresh setup)
 	if err := database.Init(
-		config.Database,
+		GetConfig().Database,
 		"admin",
 	); err != nil {
 		return err