jcarr
/
repostatus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

work on autotypist reset 

Signed-off-by: Jeff Carr <jcarr@wit.com>
This commit is contained in:
Jeff Carr 2024-01-15 08:12:04 -06:00
parent ba825e7eb0
commit ceaab24e56
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
draw.go
View File

@ -308,7 +308,7 @@ func (rs *RepoStatus) runGitCommands() bool {
s := strings.Join(line, " ") s := strings.Join(line, " ")
log.Warn("NEED TO RUN:", s) log.Warn("NEED TO RUN:", s)
rs.develMerge.SetText(s) rs.develMerge.SetText(s)
err, b, output := runCmd(rs.repopath, line) err, b, output := RunCmd(rs.repopath, line)
if err != nil { if err != nil {
log.Warn("ABEND EXECUTION") log.Warn("ABEND EXECUTION")
log.Warn("error =", err) log.Warn("error =", err)

2
git.go
View File

@ -206,7 +206,7 @@ func (rs *RepoStatus) CheckBranches() bool {
} }
var cmd []string var cmd []string
cmd = append(cmd, "git", "show", "-s", "--format=%ci", hash) cmd = append(cmd, "git", "show", "-s", "--format=%ci", hash)
_, _, output := runCmd(rs.repopath, cmd) _, _, output := RunCmd(rs.repopath, cmd)
// git show -s --format=%ci <hash> will give you the time // git show -s --format=%ci <hash> will give you the time
// log.Warn(fullfile) // log.Warn(fullfile)
if hash == hashCheck { if hash == hashCheck {

11
unix.go
View File

@ -116,6 +116,11 @@ func splitVersion(version string) (a, b, c string) {
} }
func runCmd(path string, parts []string) (error, bool, string) { func runCmd(path string, parts []string) (error, bool, string) {
fulldir := fullpath(path)
return RunCmd(fulldir, parts)
}
func RunCmd(workingpath string, parts []string) (error, bool, string) {
if len(parts) == 0 { if len(parts) == 0 {
log.Warn("command line was empty") log.Warn("command line was empty")
return errors.New("empty"), false, "" return errors.New("empty"), false, ""
@ -127,12 +132,12 @@ func runCmd(path string, parts []string) (error, bool, string) {
thing := parts[0] thing := parts[0]
parts = parts[1:] parts = parts[1:]
log.Verbose("path =", path, "thing =", thing, "cmdline =", parts) log.Warn("working path =", workingpath, "thing =", thing, "cmdline =", parts)
// Create the command // Create the command
cmd := exec.Command(thing, parts...) cmd := exec.Command(thing, parts...)
// Set the working directory // Set the working directory
cmd.Dir = fullpath(path) cmd.Dir = workingpath
// Execute the command // Execute the command
output, err := cmd.CombinedOutput() output, err := cmd.CombinedOutput()
@ -170,8 +175,6 @@ func IsDirectory(path string) bool {
return info.IsDir() return info.IsDir()
} }
func VerifyLocalGoRepo(gorepo string) bool { func VerifyLocalGoRepo(gorepo string) bool {
// Get current user // Get current user
usr, err := user.Current() usr, err := user.Current()