fix logic for go.work setups
This commit is contained in:
parent
2622e90b1f
commit
804acc169a
3
git.go
3
git.go
|
@ -298,6 +298,9 @@ func (rs *RepoStatus) CheckoutUser() bool {
|
|||
log.Log(REPO, rs.realPath.String(), "is dirty")
|
||||
return false
|
||||
}
|
||||
if ! rs.BranchExists(bName) {
|
||||
return false
|
||||
}
|
||||
cmd := []string{"git", "checkout", bName}
|
||||
err, b, output := RunCmd(rs.realPath.String(), cmd)
|
||||
if err != nil {
|
||||
|
|
8
unix.go
8
unix.go
|
@ -6,7 +6,6 @@ import (
|
|||
"io/ioutil"
|
||||
"os"
|
||||
"os/exec"
|
||||
"os/user"
|
||||
"path/filepath"
|
||||
"regexp"
|
||||
"strconv"
|
||||
|
@ -222,12 +221,7 @@ func IsDirectory(path string) bool {
|
|||
}
|
||||
|
||||
func (rs *RepoStatus) Exists(filename string) bool {
|
||||
usr, err := user.Current()
|
||||
if err != nil {
|
||||
log.Error(err, "Exists() error: could not determine what your username is")
|
||||
return false
|
||||
}
|
||||
testf := filepath.Join(usr.HomeDir, "go/src/", rs.String(), filename)
|
||||
testf := filepath.Join(rs.Path(), filename)
|
||||
if Exists(testf) {
|
||||
return true
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue