diff --git a/server/Makefile b/server/Makefile index fff673f..dcfb7da 100644 --- a/server/Makefile +++ b/server/Makefile @@ -34,32 +34,18 @@ build-dev: go build -o bin/dev$(EXE) ./cmd/dev build-all: -ifeq ($(OS),Windows_NT) - cmd /C "if not exist bin mkdir bin" -else - mkdir -p bin -endif go build -o bin/dev$(EXE) ./cmd/dev go build -o bin/auth-server$(EXE) ./cmd/auth-server go build -o bin/octo-cdn$(EXE) ./cmd/octo-cdn go build -o bin/lunar-tear$(EXE) ./cmd/lunar-tear clean: -ifeq ($(OS),Windows_NT) - cmd /C "if exist bin rmdir /s /q bin" -else - rm -rf bin -endif + rm -rf bin/* dev: go run ./cmd/dev $(ARGS) migrate: -ifeq ($(OS),Windows_NT) - cmd /C "if not exist db mkdir db" -else - mkdir -p db -endif $(GOOSE) -dir migrations -allow-missing sqlite3 db/game.db up import: diff --git a/server/cmd/wizard/main.go b/server/cmd/wizard/main.go index c00ccac..b4d9ea2 100644 --- a/server/cmd/wizard/main.go +++ b/server/cmd/wizard/main.go @@ -290,7 +290,11 @@ func runProtoc() { func runMigrate() { _ = spinner.New().Title(" Running migrations...").Action(func() { - runQuiet(exec.Command(toolPaths["make"], "migrate", "GOOSE="+toolPaths["goose"]), "database migration") + if err := os.MkdirAll("db", 0755); err != nil { + fmt.Fprintf(os.Stderr, " Failed to create db/: %v\n", err) + os.Exit(1) + } + runQuiet(exec.Command(toolPaths["goose"], "-dir", "migrations", "-allow-missing", "sqlite3", "db/game.db", "up"), "database migration") }).Run() }