aboutsummaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorXe Iaso <me@xeiaso.net>2024-02-21 09:53:25 -0500
committerXe Iaso <me@xeiaso.net>2024-02-21 09:53:35 -0500
commit12cb998b23f4c4da247872a6d29cce4cd3795285 (patch)
treec6c95bd29f9956748f7851666c86a003dac56e47 /cmd
parent988bae1ad57407cbf6533979edef6bef62e14b5d (diff)
downloadxesite-12cb998b23f4c4da247872a6d29cce4cd3795285.tar.xz
xesite-12cb998b23f4c4da247872a6d29cce4cd3795285.zip
cmd/xesite: fix public API metadata
Signed-off-by: Xe Iaso <me@xeiaso.net>
Diffstat (limited to 'cmd')
-rw-r--r--cmd/xesite/api.go20
1 files changed, 14 insertions, 6 deletions
diff --git a/cmd/xesite/api.go b/cmd/xesite/api.go
index 35bb5ae..958396f 100644
--- a/cmd/xesite/api.go
+++ b/cmd/xesite/api.go
@@ -5,6 +5,7 @@ import (
"os"
"os/exec"
"runtime"
+ "strings"
"github.com/twitchtv/twirp"
"google.golang.org/protobuf/types/known/emptypb"
@@ -13,16 +14,23 @@ import (
"xeiaso.net/v4/pb"
)
+var denoVersion string
+
+func init() {
+ cmd := exec.Command("deno", "--version")
+ out, err := cmd.CombinedOutput()
+ if err != nil {
+ denoVersion = "unknown"
+ return
+ }
+ denoVersion = strings.Split(strings.TrimSpace(string(out)), "\n")[0]
+}
+
type MetaServer struct {
fs *lume.FS
}
func (ms *MetaServer) Metadata(ctx context.Context, _ *emptypb.Empty) (*pb.BuildInfo, error) {
- deno, err := exec.LookPath("deno")
- if err != nil {
- return nil, twirp.InternalErrorf("can't find deno in $PATH: %w", err)
- }
-
commit, err := ms.fs.Commit()
if err != nil {
return nil, twirp.InternalErrorf("can't get commit hash: %w", err)
@@ -31,7 +39,7 @@ func (ms *MetaServer) Metadata(ctx context.Context, _ *emptypb.Empty) (*pb.Build
result := &pb.BuildInfo{
Commit: commit,
GoVersion: runtime.Version(),
- DenoVersion: deno,
+ DenoVersion: denoVersion,
XesiteVersion: os.Args[0],
BuildTime: timestamppb.New(ms.fs.BuildTime()),
}