From e7a3ef1298cb50fc69ca2fb61d81b4a74838a2c4 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Mon, 12 Feb 2024 18:16:03 -0600 Subject: [PATCH] try to probe the git go package type Signed-off-by: Jeff Carr --- common.go | 13 +++++++++++++ unix.go | 5 +++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/common.go b/common.go index 4174a82..31c2e37 100644 --- a/common.go +++ b/common.go @@ -1,6 +1,8 @@ package repostatus import ( + "strings" + "go.wit.com/log" // "go.wit.com/gui/gui" ) @@ -69,3 +71,14 @@ func (rs *RepoStatus) Initialized() bool { return true } */ + +func (rs *RepoStatus) RepoType() string { + err, output := rs.RunCmd([]string{"go", "list", "-f", "'{{if eq .Name \"main\"}}binary{{else}}library{{end}}'"}) + if err == nil { + output = strings.Trim(output, "'") + log.Info("go package is:", output) + return output + } + log.Info("package is: unknown", err) + return "" +} diff --git a/unix.go b/unix.go index 8af9871..ce89c92 100644 --- a/unix.go +++ b/unix.go @@ -14,6 +14,7 @@ import ( "syscall" "time" + "go.wit.com/lib/gui/shell" "go.wit.com/log" ) @@ -120,7 +121,7 @@ func splitVersion(version string) (a, b, c string) { func (rs *RepoStatus) RunCmd(parts []string) (error, string) { path := rs.realPath.String() - err, _, output := RunCmd(path, parts) + err, _, output := shell.RunCmd(path, parts) if err != nil { log.Log(WARN, "cmd:", parts) log.Log(WARN, "ouptput:", output) @@ -131,7 +132,7 @@ func (rs *RepoStatus) RunCmd(parts []string) (error, string) { // temp hack. fix this func runCmd(path string, parts []string) (error, bool, string) { - return RunCmd(path, parts) + return shell.RunCmd(path, parts) } func RunCmd(workingpath string, parts []string) (error, bool, string) {