hammering it into form

1 files changed, 8 insertions, 9 deletions

diff --git a/main.go b/main.go
index 60f7480..c977ed0 100644
--- a/main.go
+++ b/main.go
@@ -6,6 +6,7 @@ import (
 	"os"
 	"path/filepath"
 
+	"go.wit.com/lib/config"
 	"go.wit.com/lib/gui/prep"
 	"go.wit.com/lib/gui/shell"
 	"go.wit.com/lib/protobuf/zoopb"
@@ -28,10 +29,11 @@ func main() {
 
 	// read in protobuf file
 	me.pb = zoopb.NewPackages()
-	me.pb.Filename = "/home/mirrors/wit/mirrors.wit.com.pb"
+	me.pb.Filename = config.GetPanic("mirrors.pb")
 	if err := me.pb.Load(); err != nil {
 		if argv.Create {
-			me.pb.BaseDir = "/home/mirrors/wit"
+			// me.pb.BaseDir = "/home/mirrors/wit"
+			me.pb.BaseDir = config.GetPanic("BaseDir")
 			me.pb.Save()
 			me.sh.GoodExit("created new pb file: " + me.pb.Filename)
 		} else {
@@ -40,7 +42,7 @@ func main() {
 	}
 
 	if me.pb.BaseDir == "" {
-		me.pb.BaseDir = "/home/mirrors/wit"
+		me.pb.BaseDir = config.GetPanic("BaseDir")
 		me.pb.Save()
 		me.sh.BadExit("pb.BaseDir is bank", nil)
 	}
@@ -106,16 +108,13 @@ func main() {
 	}
 
 	if argv.Everything != nil {
-		s, err = doWalk()
-		if err != nil {
-			me.sh.BadExit(s, err)
-		}
+		// move files to the right place
 		s, err = doIncoming(me.pb)
 		if err != nil {
 			me.sh.BadExit(s, err)
 		}
-		// a second time, files from incoming should have
-		// been moved now
+
+		// add the filenames to the .pb
 		s, err = doWalk()
 		if err != nil {
 			me.sh.BadExit(s, err)