chore(build): wrong urls are passed

humanlogio · Oct 21, 2024 · 3499570 · 3499570
1 parent 4aff753
commit 3499570
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/.goreleaser-dev.yaml b/.goreleaser-dev.yaml
@@ -12,7 +12,7 @@ builds:
     env:
       - CGO_ENABLED=0
     ldflags:
-      - -s -w -X main.versionMajor={{.Major}} -X main.versionMinor={{.Minor}} -X main.versionPatch={{.Patch}} -X main.versionPrerelease=next.{{ .CommitTimestamp }} -X main.versionBuild={{.ShortCommit}} -X main.defaultApiAddr="https://api.humanlog.dev -X main.defaultBaseSiteAddr="https://humanlog.dev"
+      - -s -w -X main.versionMajor={{.Major}} -X main.versionMinor={{.Minor}} -X main.versionPatch={{.Patch}} -X main.versionPrerelease=next.{{ .CommitTimestamp }} -X main.versionBuild={{.ShortCommit}} -X main.defaultApiAddr=https://api.humanlog.dev -X main.defaultBaseSiteAddr=https://humanlog.dev
     goos:
       # - windows
       - darwin

diff --git a/cmd/humanlog/main.go b/cmd/humanlog/main.go
@@ -264,7 +264,13 @@ func newApp() *cli.App {
 				return getKeyring(cctx)
 			})
 		}
-		getAPIUrl      = func(*cli.Context) string { logdebug("using api at %q", apiURL); return apiURL }
+		getAPIUrl = func(*cli.Context) string {
+			if apiURL == "" {
+				apiURL = defaultApiAddr
+			}
+			logdebug("using api at %q", apiURL)
+			return apiURL
+		}
 		getBaseSiteURL = func(*cli.Context) string {
 			if baseSiteURL == "" {
 				baseSiteURL = defaultBaseSiteAddr

diff --git a/cmd/humanlog/versions.go b/cmd/humanlog/versions.go
@@ -99,8 +99,8 @@ func versionCmd(
 	getCfg func(cctx *cli.Context) *config.Config,
 	getState func(cctx *cli.Context) *state.State,
 	getTokenSource func(cctx *cli.Context) *auth.UserRefreshableTokenSource,
-	getBaseSiteURL func(cctx *cli.Context) string,
 	getAPIUrl func(cctx *cli.Context) string,
+	getBaseSiteURL func(cctx *cli.Context) string,
 	getHTTPClient func(*cli.Context) *http.Client,
 ) cli.Command {
 	return cli.Command{