diff --git a/Makefile b/Makefile index 4990228..5f9db98 100644 --- a/Makefile +++ b/Makefile @@ -77,4 +77,4 @@ patches-list: install restart: reset rm ~/go/src/repos.pb - make config + make private diff --git a/cobol.go b/cobol.go index c1ebf69..bf93c26 100644 --- a/cobol.go +++ b/cobol.go @@ -33,7 +33,7 @@ func doCobol() { log.DaemonMode(true) // log.Info(standardStart5("gopath", "cur name", "master", "user", "repo type")) - log.Info(standardStart7("gopath", "cur name", "target", "master", "devel", "user", "repo type")) + log.Info(standardStart8("gopath", "cur name", "target", "master", "devel", "user", "curver", "repo type")) all := me.found.SortByFullPath() for all.Scan() { repo := all.Next() @@ -71,14 +71,15 @@ func standardStart5(arg1, arg2, arg3, arg4, arg5 string) string { return fmt.Sprintf(s, arg1, arg2, arg3, arg4, arg5) } -func standardStart7(arg1, arg2, arg3, arg4, arg5, arg6, arg7 string) string { +func standardStart8(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8 string) string { len1 := 40 len2 := 12 len3 := 16 len4 := 16 len5 := 16 len6 := 16 - len7 := 8 + len7 := 16 + len8 := 8 var s string if len(arg1) > len1 { arg1 = arg1[:len1] @@ -100,17 +101,23 @@ func standardStart7(arg1, arg2, arg3, arg4, arg5, arg6, arg7 string) string { if len(arg5) > len5 { arg5 = arg5[:len5] } - s += "%-" + fmt.Sprintf("%d", len5) + "s " + s += "%-" + fmt.Sprintf("%d", len5) + "s " if len(arg6) > len6 { arg6 = arg6[:len6] } - s += "%-" + fmt.Sprintf("%d", len6) + "s " + s += "%-" + fmt.Sprintf("%d", len6) + "s " if len(arg7) > len7 { arg7 = arg7[:len7] } - s += "%-" + fmt.Sprintf("%d", len7) + "s" + s += "%-" + fmt.Sprintf("%d", len7) + "s " + + if len(arg8) > len8 { + arg8 = arg8[:len8] + } + s += "%-" + fmt.Sprintf("%d", len8) + "s" + return fmt.Sprintf(s, arg1, arg2, arg3, arg4, arg5, arg6, arg7) } @@ -130,14 +137,15 @@ func verifyPrint(repo *gitpb.Repo) { } } - var mhort string = s["mver"] - var dhort string = s["dver"] - var uhort string = s["uver"] - var thort string = s["tver"] - var cname string = s["cname"] + var mhort string = s["mver"] // master version + var dhort string = s["dver"] // devel version + var uhort string = s["uver"] // user version + var thort string = s["tver"] // target version + var chort string = s["cver"] // current version + var cname string = s["cname"] // current branch name git is on now // start := fmt.Sprintf("%-40s %-12s %-12s %-12s %-8s", s["gopath"], cname, mhort, uhort, s["rtype"]) - start := standardStart7(s["gopath"], cname, thort, mhort, dhort, uhort, s["rtype"]) + start := standardStart8(s["gopath"], cname, thort, mhort, dhort, uhort, chort, s["rtype"]) if me.forge.Config.IsReadOnly(repo.GetGoPath()) { end += "(readonly) "