diff --git a/draw.go b/draw.go index 5158f98..c6f2c17 100644 --- a/draw.go +++ b/draw.go @@ -308,7 +308,7 @@ func (rs *RepoStatus) runGitCommands() bool { s := strings.Join(line, " ") log.Warn("NEED TO RUN:", s) rs.develMerge.SetText(s) - err, b, output := RunCmd(rs.repopath, line) + err, b, output := runCmd(rs.repopath, line) if err != nil { log.Warn("ABEND EXECUTION") log.Warn("error =", err) diff --git a/go.mod b/go.mod index 04fe849..01dd625 100644 --- a/go.mod +++ b/go.mod @@ -1,16 +1,16 @@ -module go.wit.com/gui/gadgets/repostatus +module go.wit.com/gui/lib/repostatus go 1.21.4 require ( - go.wit.com/gui/gadgets v0.12.3 - go.wit.com/gui/gui v0.12.8 - go.wit.com/log v0.5.3 + go.wit.com/gui/gadgets v0.12.4 + go.wit.com/gui/gui v0.12.9 + go.wit.com/log v0.5.4 ) require ( go.wit.com/dev/alexflint/arg v1.4.5 // indirect go.wit.com/dev/alexflint/scalar v1.2.1 // indirect - go.wit.com/dev/davecgh/spew v1.1.3 // indirect + go.wit.com/dev/davecgh/spew v1.1.4 // indirect go.wit.com/gui/widget v1.1.3 // indirect ) diff --git a/go.sum b/go.sum index b962192..c6ed956 100644 --- a/go.sum +++ b/go.sum @@ -2,13 +2,13 @@ go.wit.com/dev/alexflint/arg v1.4.5 h1:asDx5f9IlfpknKjPBqqb2qndE91Pbo7ZDkWUgddfM go.wit.com/dev/alexflint/arg v1.4.5/go.mod h1:wnWc+c6z8kSdDKYriMf6RpM+FiXmo5RYp/t4FNi0MU0= go.wit.com/dev/alexflint/scalar v1.2.1 h1:loXOcbVnd+8YeJRLey+XXidecBiedMDO00zQ26TvKNs= go.wit.com/dev/alexflint/scalar v1.2.1/go.mod h1:+rYsfxqdI2cwA8kJ7GCMwWbNJvfvWUurOCXLiwdTtSs= -go.wit.com/dev/davecgh/spew v1.1.3 h1:hqnB5qsPgC2cLZaJXqQJspQ5n/Ugry9kyL3tLk0hVzQ= -go.wit.com/dev/davecgh/spew v1.1.3/go.mod h1:sihvWmnQ/09FWplnEmozt90CCVqBtGuPXM811tgfhFA= -go.wit.com/gui/gadgets v0.12.3 h1:jy7I5fYUkwywq5HiYtpkuhNpixF0myRHliHSX9Xn2l4= -go.wit.com/gui/gadgets v0.12.3/go.mod h1:Wem8Gn+dyDhYXrKl+LCojYz4X9c1KsT65EAUNzQsUaY= -go.wit.com/gui/gui v0.12.8 h1:YJ7YjdP9+vwWYVvMakaJPPpfPt9g33Iw0xfuwNQZkmA= -go.wit.com/gui/gui v0.12.8/go.mod h1:iALRA0qw7mn82MX21wrU0FOq/vR9l27If7ObNdOSlNE= +go.wit.com/dev/davecgh/spew v1.1.4 h1:C9hj/rjlUpdK+E6aroyLjCbS5MFcyNUOuP1ICLWdNek= +go.wit.com/dev/davecgh/spew v1.1.4/go.mod h1:sihvWmnQ/09FWplnEmozt90CCVqBtGuPXM811tgfhFA= +go.wit.com/gui/gadgets v0.12.4 h1:00KBjz+jjyXSeJxq62OWh6d1dKgOBuUUot63cWIP0ts= +go.wit.com/gui/gadgets v0.12.4/go.mod h1:OB7MtEZy/VK2HrU3yiEuzY9n4LjZwO0L06NYUAFybJs= +go.wit.com/gui/gui v0.12.9 h1:Xrs8v/gbbQnsjCnF3BCNXgddH5oB8xTjlysL9Ul1aRs= +go.wit.com/gui/gui v0.12.9/go.mod h1:YgbFWxsGqZb45oLGaHim2GukPzPgMLQcVRRI0QkrGS8= go.wit.com/gui/widget v1.1.3 h1:GvLzGSOF9tfmoh6HNbFdN+NSlBo2qeS/Ba2TnQQ1A1U= go.wit.com/gui/widget v1.1.3/go.mod h1:A6/FaiFQtAHTjgo7c4FrokXe6bXX1Cowo35b2Lgi31E= -go.wit.com/log v0.5.3 h1:/zHkniOPusPEuX1R401rMny9uwSO/nSU/QOMx6qoEnE= -go.wit.com/log v0.5.3/go.mod h1:LzIzVxc2xJQxWQBtV9VbV605P4TOxmYDCl+BZF38yGE= +go.wit.com/log v0.5.4 h1:vijLRPTUgChb8J5tx/7Uma/lGTUxeSXosFbheAmL914= +go.wit.com/log v0.5.4/go.mod h1:BaJBfHFqcJSJLXGQ9RHi3XVhPgsStxSMZRlaRxW4kAo= diff --git a/unix.go b/unix.go index 05bd372..7ef0fed 100644 --- a/unix.go +++ b/unix.go @@ -115,6 +115,7 @@ func splitVersion(version string) (a, b, c string) { } } +// temp hack. fix this func runCmd(path string, parts []string) (error, bool, string) { fulldir := fullpath(path) return RunCmd(fulldir, parts)