s/ENV/env/ but ENV really is better herev0.25.100

1 files changed, 6 insertions, 6 deletions

diff --git a/doNormal.go b/doNormal.go
index cf6b64d..e297d04 100644
--- a/doNormal.go
+++ b/doNormal.go
@@ -12,8 +12,8 @@ import (
 	"strings"
 	"time"
 
-	"go.wit.com/lib/ENV"
 	"go.wit.com/lib/config"
+	"go.wit.com/lib/env"
 	"go.wit.com/lib/fhelp"
 	"go.wit.com/lib/gui/shell"
 	"go.wit.com/lib/protobuf/forgepb"
@@ -28,7 +28,7 @@ func doNormalAll() (string, error) {
 	var err error
 
 	me.curpatches = forgepb.NewPatches()
-	me.curpatches.Filename = ENV.Get("curpatches")
+	me.curpatches.Filename = env.Get("curpatches")
 	if me.curpatches.Filename == "" {
 		panic("config failed. no 'curpatches' set in ~/.config/forge/config.text")
 	}
@@ -40,7 +40,7 @@ func doNormalAll() (string, error) {
 		// return
 		// // THIS IS NEEDED? NOTSURE
 		me.curpatches = forgepb.NewPatches()
-		me.curpatches.Filename = ENV.Get("curpatches")
+		me.curpatches.Filename = env.Get("curpatches")
 		me.curpatches.Save()
 	}
 
@@ -156,11 +156,11 @@ func doNormalStatus() bool {
 // this also verifies that
 func checkNormalRepoState(repo *gitpb.Repo) error {
 	var err error
-	tmp := filepath.Join(ENV.Get("gopath"), repo.GetNamespace())
+	tmp := filepath.Join(env.Get("gopath"), repo.GetNamespace())
 	if tmp != repo.FullPath {
 		log.Infof("checkNormalRepoState() %s != %s\n", repo.FullPath, tmp)
-		if strings.HasPrefix(repo.FullPath, ENV.Get("gopath")) {
-			tmp = strings.TrimPrefix(repo.FullPath, ENV.Get("gopath"))
+		if strings.HasPrefix(repo.FullPath, env.Get("gopath")) {
+			tmp = strings.TrimPrefix(repo.FullPath, env.Get("gopath"))
 			tmp = strings.Trim(tmp, "/")
 			repo.Namespace = tmp
 			err = log.Errorf("namespace set to filepath")