make forged config come from /etcv0.0.52

5 files changed, 24 insertions, 7 deletions

diff --git a/Makefile b/Makefile
index 705d0a6..cbc480b 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ VERSION = $(shell git describe --tags)
 BUILDTIME = $(shell date +%s)
 
 all: build
-	./forged repos list
+	./forged repos
 
 build: goimports
 	GO111MODULE=off go build \
diff --git a/doRepos.go b/doRepos.go
index 8d8ac24..000f35f 100644
--- a/doRepos.go
+++ b/doRepos.go
@@ -14,6 +14,7 @@ import (
 func doRepos() error {
 	if argv.Repos.List != nil {
 		me.forge.PrintForgedTable(me.forge.Repos)
+		// me.forge.PrintPullTable(me.forge.Repos)
 		// return doReposList()
 		return nil
 	}
diff --git a/handleRepos.go b/handleRepos.go
index bf49a46..34f04f5 100644
--- a/handleRepos.go
+++ b/handleRepos.go
@@ -51,11 +51,27 @@ func addRequest(pb *gitpb.Repos, reqPB *httppb.HttpRequest) *gitpb.Repos {
 		if found := me.forge.Repos.FindByNamespace(repo.Namespace); found != nil {
 			// already know about this namespace
 			continue
+		} else {
+			newReposPB.Append(found)
 		}
-		newrepo := new(gitpb.Repo)
-		newrepo.Namespace = repo.Namespace
-		newrepo.URL = repo.URL
-		newReposPB.Append(newrepo)
+		/*
+			newrepo := new(gitpb.Repo)
+			newrepo.Namespace = repo.Namespace
+			newrepo.URL = repo.URL
+		*/
 	}
 	return newReposPB
 }
+
+func checkRequest(pb *gitpb.Repos, reqPB *httppb.HttpRequest) *gitpb.Repos {
+	checkPB := gitpb.NewRepos()
+	for repo := range pb.IterAll() {
+		found := me.forge.Repos.FindByNamespace(repo.Namespace)
+		if found == nil {
+			// don't know about this
+			continue
+		}
+		checkPB.Append(found)
+	}
+	return checkPB
+}
diff --git a/http.go b/http.go
index 7113fb8..22db236 100644
--- a/http.go
+++ b/http.go
@@ -45,7 +45,7 @@ func okHandler(w http.ResponseWriter, r *http.Request) {
 		result := gitpb.NewRepos()
 		switch route {
 		case "/repos/check":
-			result = addRequest(pb, reqPB)
+			result = checkRequest(pb, reqPB)
 			reqPB.Logf("repos check result.Len()=%d pb.Len()=%d", result.Len(), pb.Len())
 		case "/repos/pull":
 			result = pullRequest(pb, reqPB)
diff --git a/main.go b/main.go
index 3ea9e93..00e508c 100644
--- a/main.go
+++ b/main.go
@@ -26,7 +26,7 @@ func main() {
 	me.myGui = prep.Gui()      // prepares the GUI package for go-args
 	me.auto = prep.Bash(&argv) // this line should be:  prep.Bash(&argv)
 
-	me.forge = forgepb.InitByAppname(ARGNAME)
+	me.forge = forgepb.InitByFullpath("/etc/forged/forge.text")
 	me.forge.Config.DumpENV()
 
 	if err := me.forge.InitPatchsets(); err != nil {