stable point

hofstadter-io · May 15, 2020 · cdf81cf · cdf81cf
1 parent 75ba5fe
commit cdf81cf
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 8 deletions.
diff --git a/.hof/Config/lib/cuefig/config.go b/.hof/Config/lib/cuefig/config.go
@@ -21,9 +21,9 @@ var ConfigFilepath string
 func init() {
 	cfgdir, err := os.UserConfigDir()
 	if err == nil {
-		ConfigFilepath = filepath.Join(cfgdir, "hof/config.cue")
+		ConfigFilepath = filepath.Join(cfgdir, "hofconfig.cue")
 	} else {
-		ConfigFilepath = "hof/config.cue"
+		ConfigFilepath = "hofconfig.cue"
 	}
 }
 

diff --git a/design/hof-config.cue b/design/hof-config.cue
@@ -6,7 +6,7 @@ import (
 
 #HofConfig: schema.#Config & {
   Name: "config"
-  Entrypoint: "\(#CLI.ConfigDir)/config.cue"
+  Entrypoint: "hofconfig.cue"
 
   ConfigSchema: {
     models: {

diff --git a/lib/cuefig/config.go b/lib/cuefig/config.go
@@ -21,9 +21,9 @@ var ConfigFilepath string
 func init() {
 	cfgdir, err := os.UserConfigDir()
 	if err == nil {
-		ConfigFilepath = filepath.Join(cfgdir, "dma/config.cue")
+		ConfigFilepath = filepath.Join(cfgdir, "hofconfig.cue")
 	} else {
-		ConfigFilepath = "dma/config.cue"
+		ConfigFilepath = "hofconfig.cue"
 	}
 }
 

diff --git a/test/modelset/cue.mods b/test/modelset/cue.mods
@@ -2,4 +2,4 @@ module github.com/hofstadter-io/dma/test
 
 cue master
 
-replace github.com/hofstadter-io/dma => ../
+replace github.com/hofstadter-io/dma => ../../
diff --git a/test/modelset/cue.sums b/test/modelset/cue.sums
@@ -10,3 +10,5 @@ github.com/hofstadter-io/hofmod-cuefig v0.0.1 h1:B1mWOVnf35Dzqlha+vUjUd7GeQUSJQf
 github.com/hofstadter-io/hofmod-cuefig v0.0.1/cue.mods h1:+3nl34nAVsm6hJTnDsZtfIrYGIkLqrr1yuGZvO9agBg=
 github.com/hofstadter-io/mvs v0.5.0 h1:PMCgjy0HABxx0EuCnB7ODmlC/rP7cwZu3jWyTnVF37E=
 github.com/hofstadter-io/mvs v0.5.0/cue.mods h1:3zTO9yBRvH0ML28h37/T/hWbOFG9d09eR1rTNKn60PU=
+github.com/hofstadter-io/mvs v0.7.6 h1:CbQ4Ar9KwJdLppnI0pPU9yd8gXAxhsa3GY8CGyWVMYg=
+github.com/hofstadter-io/mvs v0.7.6/cue.mods h1:sZTpALxLKwai/4N7ljwCxJ67J8V5/SMpZ4huAKoK2cU=
diff --git a/test/modelset/dma/meta.cue → test/modelset/hofconfig.cue b/test/modelset/dma/meta.cue → test/modelset/hofconfig.cue
@@ -1,7 +1,7 @@
-package dma
+package hofconfig
 
 import (
-	"github.com/hofstadter-io/dma/schema"
+	"github.com/hofstadter-io/hof/schema"
 )
 
 modelsets: schema.#Modelsets & {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,4 @@ module github.com/hofstadter-io/dma/test

		cue master

		replace github.com/hofstadter-io/dma => ../
		replace github.com/hofstadter-io/dma => ../../