summaryrefslogtreecommitdiff
path: root/Load.go
diff options
context:
space:
mode:
Diffstat (limited to 'Load.go')
-rw-r--r--Load.go10
1 files changed, 5 insertions, 5 deletions
diff --git a/Load.go b/Load.go
index 34f5ef3..ec1d035 100644
--- a/Load.go
+++ b/Load.go
@@ -13,8 +13,8 @@ import (
"errors"
"os"
- "go.wit.com/lib/ENV"
"go.wit.com/lib/config"
+ "go.wit.com/lib/env"
"go.wit.com/lib/protobuf/argvpb"
"go.wit.com/lib/protobuf/gitpb"
"go.wit.com/log"
@@ -29,7 +29,7 @@ func (pb *ForgeConfigs) loadConfig() error {
log.Info("forge has not been configured")
panic("config failed to load. make a new/blank forge config here?")
}
- ENV.SetGlobal("lib/forgepb", "ForgeCfg", pb.Filename)
+ env.SetGlobal("lib/forgepb", "ForgeCfg", pb.Filename)
var changed bool
// migrate from the old gopath to "namespace"
for fc := range pb.IterAll() {
@@ -60,7 +60,7 @@ func (f *Forge) reposCacheLoad() error {
f.Repos.Filename = config.MakeCacheFilename("forge", "repos")
err := config.ReLoad(f.Repos)
if err == nil {
- ENV.SetGlobal("lib/forgepb", "ReposPB", f.Repos.Filename)
+ env.SetGlobal("lib/forgepb", "ReposPB", f.Repos.Filename)
}
return err
}
@@ -81,7 +81,7 @@ func (f *Forge) patchesCacheLoad() error {
log.Printf("patchesCacheLoad() failed err (%v) filename (%s)\n", err, f.Patches.Filename)
panic("failed to load patches")
}
- ENV.SetGlobal("lib/forgepb", "PatchesPB", f.Patches.Filename)
+ env.SetGlobal("lib/forgepb", "PatchesPB", f.Patches.Filename)
return err
}
@@ -91,7 +91,7 @@ func makeDefaultConfig() (*ForgeConfigs, error) {
cfg.loadConfig()
cfg.addSampleConfigs()
- ENV.PrintTable()
+ env.PrintTable()
var err error
if err = cfg.saveVerbose(); err != nil {
log.Info("config save error:", err)