diff --git a/Makefile b/Makefile index d776acc..becf490 100644 --- a/Makefile +++ b/Makefile @@ -68,11 +68,11 @@ build-tq: ## Build tq for the host into ./bin/tq. .PHONY: build-tq-dev build-tq-dev: ## Build tq and service binaries with the dev profile. cd cmd/web/frontend && npm ci && npm run build - mkdir -p ./.tasq-dev/system/bin - go build -ldflags "-X github.com/version-1/tasq/internal/cli/tq.buildCommit=$(TQ_BUILD_COMMIT) -X github.com/version-1/tasq/internal/config.defaultHomeProfile=dev -X github.com/version-1/tasq/internal/config.defaultHomePath=$(CURDIR)/.tasq-dev" -o ./tqdev ./cmd/tq - go build -o ./.tasq-dev/system/bin/issue-tracker ./cmd/issue-tracker - go build -o ./.tasq-dev/system/bin/orchestrator ./cmd/orchestrator - go build -o ./.tasq-dev/system/bin/web ./cmd/web + mkdir -p "$(HOME)/.tasq-dev/system/bin" + go build -ldflags "-X github.com/version-1/tasq/internal/cli/tq.buildCommit=$(TQ_BUILD_COMMIT) -X github.com/version-1/tasq/internal/config.defaultHomeProfile=dev" -o ./tqdev ./cmd/tq + go build -o "$(HOME)/.tasq-dev/system/bin/issue-tracker" ./cmd/issue-tracker + go build -o "$(HOME)/.tasq-dev/system/bin/orchestrator" ./cmd/orchestrator + go build -o "$(HOME)/.tasq-dev/system/bin/web" ./cmd/web .PHONY: dev-check dev-check: diff --git a/internal/config/config_test.go b/internal/config/config_test.go index 0be5065..61efe7f 100644 --- a/internal/config/config_test.go +++ b/internal/config/config_test.go @@ -44,26 +44,6 @@ func TestHomeUsesDefaultProfile(t *testing.T) { } } -func TestHomeUsesDefaultPathBeforeProfile(t *testing.T) { - originalPath := defaultHomePath - originalProfile := defaultHomeProfile - defaultHomePath = filepath.Join(t.TempDir(), "tasq-dev") - defaultHomeProfile = "preview" - t.Cleanup(func() { - defaultHomePath = originalPath - defaultHomeProfile = originalProfile - }) - t.Setenv(EnvHome, "") - - home, err := Home() - if err != nil { - t.Fatalf("home: %v", err) - } - if want := defaultHomePath; home != want { - t.Fatalf("home=%q, want %q", home, want) - } -} - func TestDefaultHomeProfileRejectsInvalidValue(t *testing.T) { originalProfile := defaultHomeProfile defaultHomeProfile = "Preview" diff --git a/internal/config/home.go b/internal/config/home.go index 369dc88..8041e77 100644 --- a/internal/config/home.go +++ b/internal/config/home.go @@ -13,19 +13,6 @@ const ( ) var defaultHomeProfile = "" -var defaultHomePath = "" - -func DefaultHomePath() (string, error) { - path := strings.TrimSpace(defaultHomePath) - if path == "" { - return "", nil - } - resolved, err := filepath.Abs(path) - if err != nil { - return "", fmt.Errorf("resolve default home: %w", err) - } - return resolved, nil -} func DefaultHomeProfile() (string, error) { profile := strings.TrimSpace(defaultHomeProfile) @@ -44,13 +31,6 @@ func Home() (string, error) { if value := strings.TrimSpace(os.Getenv(EnvHome)); value != "" { return filepath.Abs(value) } - path, err := DefaultHomePath() - if err != nil { - return "", err - } - if path != "" { - return path, nil - } profile, err := DefaultHomeProfile() if err != nil { return "", err