remove ENV stuffv0.0.49

4 files changed, 7 insertions, 24 deletions

diff --git a/config.go b/config.go
index 81dba5a..288e4c3 100644
--- a/config.go
+++ b/config.go
@@ -22,21 +22,12 @@ func configInit() *forgepb.ForgeConfigs {
 		HOSTNAME = argv.Hostname
 	}
 
-	// the default forged dir is /home/forge
-	if os.Getenv("FORGE_REPODIR") == "" {
-		os.Setenv("FORGE_REPODIR", "/home/forge")
-	}
-
-	if os.Getenv("FORGE_PATCHDIR") == "" {
-		os.Setenv("FORGE_PATCHDIR", "/var/lib/forged")
-	}
-
 	configs := new(forgepb.ForgeConfigs)
 	err := config.ConfigLoad(configs, ARGNAME, "forge")
 	if errors.Is(err, os.ErrNotExist) {
-		configs.ReposDir = os.Getenv("FORGE_REPODIR")
+		configs.ReposDir = "/var/cache/forged"
 		configs.ReposPB = filepath.Join(configs.ReposDir, "repos.pb")
-		configs.PatchDir = os.Getenv("FORGE_PATCHDIR")
+		configs.PatchDir = "/var/cache/forged"
 		if err := configSave(); err != nil {
 			badExit(err)
 		}
diff --git a/doPatches.go b/doPatches.go
index cc06c03..e4008c6 100644
--- a/doPatches.go
+++ b/doPatches.go
@@ -1,7 +1,6 @@
 package main
 
 import (
-	"go.wit.com/lib/fhelp"
 	"go.wit.com/lib/protobuf/forgepb"
 	"go.wit.com/log"
 )
@@ -9,14 +8,12 @@ import (
 func doPatches() error {
 	if argv.Patch.List != nil {
 		log.Printf("forge.Init() %s len()=%d\n", me.forge.Config.Filename, me.forge.Repos.Len())
-		fhelp.DumpENV("finit:")
 		me.forge.Config.DumpENV()
 		return doList()
 	}
 
 	if argv.Patch.Clean != nil {
 		log.Printf("forge.Init() %s len()=%d\n", me.forge.Config.Filename, me.forge.Repos.Len())
-		fhelp.DumpENV("finit:")
 		me.forge.Config.DumpENV()
 		return doClean()
 	}
diff --git a/doRepos.go b/doRepos.go
index f500dc1..0786ca7 100644
--- a/doRepos.go
+++ b/doRepos.go
@@ -25,11 +25,11 @@ func doRepos() error {
 
 func doReposInit() {
 	log.Info("do pull here")
-	dirs, err := scanForgedDir(FORGEDIR)
+	dirs, err := scanForgedDir(me.forge.Config.ReposDir)
 	if err != nil {
 		badExit(err)
 	}
-	os.Chdir(FORGEDIR)
+	os.Chdir(me.forge.Config.ReposDir)
 
 	for _, dir := range dirs {
 		// log.Info("found repo", i, dir)
@@ -87,7 +87,7 @@ func tryGitClone(repo *gitpb.Repo, dir string) error {
 
 func initForged() error {
 	log.Info("do pull here")
-	dirs, err := scanForgedDir(FORGEDIR)
+	dirs, err := scanForgedDir(me.forge.Config.ReposDir)
 	if err != nil {
 		return err
 	}
@@ -122,10 +122,7 @@ func initForged() error {
 func verifyForged() {
 	var changed bool = false
 	for repo := range me.forge.Repos.IterAll() {
-		if strings.HasPrefix(repo.GetFullPath(), os.Getenv("FORGE_GOSRC")) {
-			// log.Info(os.Getenv("FORGE_GOSRC"), repo.GetFullPath())
-		} else {
-			log.Info("not here", os.Getenv("FORGE_GOSRC"), repo.GetFullPath())
+		// do something
 			me.forge.Repos.Delete(repo)
 			changed = true
 		}
@@ -138,7 +135,7 @@ func verifyForged() {
 
 func doReposList() error {
 	log.Info("do pull here")
-	dirs, err := scanForgedDir(FORGEDIR)
+	dirs, err := scanForgedDir(me.forge.Config.ReposDir)
 	if err != nil {
 		badExit(err)
 		return err
diff --git a/main.go b/main.go
index 719fdf0..3ea9e93 100644
--- a/main.go
+++ b/main.go
@@ -20,8 +20,6 @@ var ARGNAME string = "forged"
 var resources embed.FS
 
 var HOSTNAME string = "forge.wit.com"
-var LIBDIR string = "/var/lib/forged/" // need to deprecate this
-var FORGEDIR string = "/home/forge"    // deprecated?
 
 func main() {
 	me = new(mainType)