might work from the .deb file finally

4 files changed, 20 insertions, 19 deletions

diff --git a/build b/build
index 4dfcd69..111932f 100755
--- a/build
+++ b/build
@@ -12,3 +12,6 @@ cp resources/wit.list files/etc/apt/sources.list.d/
 
 mkdir -p files/usr/share/bash-completion/completions/
 mirrors --bash > files/usr/share/bash-completion/completions/mirrors
+
+mkdir -p  files/etc/mirrors.d/
+cp resources/mirrors.rc files/etc/mirrors.d/mirrors.wit.com
diff --git a/doIncoming.go b/doIncoming.go
index f592cad..bca869a 100644
--- a/doIncoming.go
+++ b/doIncoming.go
@@ -11,7 +11,7 @@ import (
 	"go.wit.com/log"
 )
 
-func moveOutOfIncoming(fullname string) error {
+func moveOutOfIncoming(fullname string, repopath string) error {
 	_, filename := filepath.Split(fullname)
 	parts := strings.Split(filename, "_")
 	if len(parts) != 3 {
@@ -20,7 +20,7 @@ func moveOutOfIncoming(fullname string) error {
 	}
 	packageName := parts[0]
 	letteredDir := log.Sprintf("%1.1s", filename)
-	newfilename := filepath.Join("pool/main", letteredDir, packageName, filename)
+	newfilename := filepath.Join(repopath, letteredDir, packageName, filename)
 
 	destDir := filepath.Dir(newfilename)
 	if err := os.MkdirAll(destDir, 0755); err != nil {
@@ -32,10 +32,8 @@ func moveOutOfIncoming(fullname string) error {
 		log.Info("DEBIAN POLICY: YOU CAN NEVER REBUILD THE SAME FILE. APT WILL NOT REINSTALL IT. AUTO REMOVE: ", fullname)
 		return os.Remove(fullname)
 	}
-	if argv.Force {
-		// file can be moved
-		os.Rename(fullname, newfilename)
-	}
+	// file can be moved
+	os.Rename(fullname, newfilename)
 	log.Printf("%s  moved incoming oldname %s newname: %s\n", packageName, fullname, newfilename)
 	return nil
 }
@@ -53,7 +51,7 @@ func doIncoming(pb *zoopb.Packages) (string, error) {
 
 	for _, filename := range files {
 		// log.Info("need to move", filename)
-		moveOutOfIncoming(filename)
+		moveOutOfIncoming(filename, "pool/main")
 	}
 
 	globPattern = "/home/mirrors/wit/incoming-devel/*.deb"
@@ -64,7 +62,7 @@ func doIncoming(pb *zoopb.Packages) (string, error) {
 
 	for _, filename := range files {
 		// log.Info("need to move", filename)
-		moveOutOfIncoming(filename)
+		moveOutOfIncoming(filename, "pool/main")
 	}
 
 	s := log.Sprintf("scanned (%d) in incoming", len(files))
diff --git a/main.go b/main.go
index 89ae979..42ceee1 100644
--- a/main.go
+++ b/main.go
@@ -19,6 +19,8 @@ var resources embed.FS
 func main() {
 	me = new(mainType)
 	argvpb.Init(&argv, APPNAME, BUILDTIME, VERSION) // adds shell auto-complete
+	env.LoadEtc()                                   // loads settings from /etc/mirrors.d/
+	env.PrintTable()
 
 	// read in protobuf file
 	me.pb = zoopb.NewPackages()
@@ -46,15 +48,8 @@ func main() {
 	}
 
 	if argvpb.PB.GetCmd() == "" {
-		// STANDARD START
-		// walk for new .deb files
-		s, err := doWalk()
-		if err != nil {
-			argvpb.BadExit(s, err)
-		}
-
 		// move files from inccoming into pooo/
-		s, err = doIncoming(me.pb)
+		s, err := doIncoming(me.pb)
 		if err != nil {
 			argvpb.BadExit(s, err)
 		}
@@ -68,14 +63,15 @@ func main() {
 	var err error
 
 	// handling of argv subcommands
-	if argv.Incoming != nil {
-		s, err = doIncoming(me.pb)
-	}
 
 	if argv.Walk != nil {
 		s, err = doWalk()
 	}
 
+	if argv.Incoming != nil {
+		s, err = doIncoming(me.pb)
+	}
+
 	if argv.Newest != nil {
 		all := doGetNewest("amd64")
 		s = "newest .deb files table: " + all.PrintTable()
diff --git a/resources/mirrors.rc b/resources/mirrors.rc
new file mode 100644
index 0000000..9f14408
--- /dev/null
+++ b/resources/mirrors.rc
@@ -0,0 +1,4 @@
+mirrors.pb=/home/mirrors/wit/mirrors.wit.com.pb
+BaseDir=/home/mirrors/wit
+distPath=/home/mirrors/wit/dists/sid
+gpgKeyID=5D7C9BE47836D2FA48F83C2B4A854AEAF7E0E16D