some working on seperate cache / mode settings

1 files changed, 5 insertions, 13 deletions

diff --git a/doNormal.go b/doNormal.go
index cf333fd..e8ccd68 100644
--- a/doNormal.go
+++ b/doNormal.go
@@ -28,20 +28,9 @@ func doNormalAll() (string, error) {
 	var err error
 
 	me.curpatches = forgepb.NewPatches()
-	me.curpatches.Filename = env.Get("curpatches")
-	if me.curpatches.Filename == "" {
-		panic("config failed. no 'curpatches' set in ~/.config/forge/config.text")
-	}
+	me.curpatches.Filename = config.MakeCacheFilename("forge", "curpatches")
 	if err := me.curpatches.Load(); err != nil {
-		me.curpatches.Save()
-		me.curpatches.Save()
-		log.Info(err)
 		panic("no file")
-		// return
-		// // THIS IS NEEDED? NOTSURE
-		me.curpatches = forgepb.NewPatches()
-		me.curpatches.Filename = env.Get("curpatches")
-		me.curpatches.Save()
 	}
 
 	psets := forgepb.NewSets()
@@ -62,6 +51,9 @@ func doNormalAll() (string, error) {
 }
 
 func (a *args) DoNormal() (string, error) {
+	env.Set("modeDir", "jwc")
+	env.Save()
+	panic("donormal. yay")
 	return doNormalAttempt()
 }
 
@@ -273,7 +265,7 @@ func checkNormalRepoState(repo *gitpb.Repo) error {
 	// verify read-only
 	if me.forge.Config.IsReadOnly(repo.GetNamespace()) != repo.GetReadOnly() {
 		repo.ReadOnly = me.forge.Config.IsReadOnly(repo.GetNamespace())
-		log.Info("damnit", repo.FullPath)
+		log.Info("readonly bit wrong", repo.FullPath)
 		err = log.Errorf("readonly bit wrong")
 	}
 	return err