Add static dir to config

drew-harris · Sep 10, 2023 · 4c58d13 · 4c58d13
1 parent acf0520
commit 4c58d13
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/config/config.go b/config/config.go
@@ -11,6 +11,7 @@ import (
 
 type Config struct {
 	ShulkerboxUrl   string   `yaml:"shulker_box_url"`
+	StaticDir       string   `yaml:"static_dir"`
 	PluginCopyPaths []string `yaml:"plugin_paths"`
 }
 

diff --git a/engine/hostengine.go b/engine/hostengine.go
@@ -122,6 +122,9 @@ func (h *HostEngine) StartServer(log types.Logger) error {
 	}
 
 	h.server = exec.CommandContext(context, cmdtmp.Name, cmdtmp.Args...)
+	os.Setenv("STATIC_DIR", h.config.StaticDir)
+	log("static dir : " + h.config.StaticDir)
+	h.server.Env = os.Environ()
 	h.server.Dir = baseDir
 
 	// Display output
@@ -154,7 +157,6 @@ func (h *HostEngine) StartServer(log types.Logger) error {
 	return nil
 }
 
-// Not implemented
 func (h *HostEngine) Shutdown() error {
 	if h.server != nil {
 		h.cancel()

diff --git a/model/model.go b/model/model.go
@@ -9,16 +9,11 @@ import (
 	"github.com/charmbracelet/bubbles/textinput"
 	"github.com/charmbracelet/bubbles/viewport"
 	tea "github.com/charmbracelet/bubbletea"
-	dtypes "github.com/docker/docker/api/types"
 	"github.com/drewharris/shulker/config"
 	"github.com/drewharris/shulker/engine"
 	"github.com/drewharris/shulker/types"
 )
 
-type ServerExec struct {
-	Connection dtypes.HijackedResponse
-}
-
 type Loggers struct {
 	error   types.Logger
 	build   types.Logger