riscv64 might work now (?)

3 files changed, 56 insertions, 34 deletions

diff --git a/argv.go b/argv.go
index e7078a1..192ce81 100644
--- a/argv.go
+++ b/argv.go
@@ -53,7 +53,7 @@ func (args) Appname() string {
 }
 
 func (a args) DoAutoComplete(pb *prep.Auto) {
-	base := []string{"--dry-run", "--force", "incoming", "walk", "list", "everything", "verify", "newest", "--create", "--verbose"}
+	base := []string{"--dry-run", "--force", "incoming", "walk", "list", "everything", "verify", "newest", "--create", "--verbose", "release"}
 
 	if pb.Cmd == "" {
 		pb.Autocomplete3(base)
diff --git a/main.go b/main.go
index 0995076..89435e0 100644
--- a/main.go
+++ b/main.go
@@ -97,7 +97,9 @@ func main() {
 	}
 
 	if argv.SignRelease != nil {
-		s, err = doRelease()
+		err = doPurge()
+		s, err = makePackagesFile("riscv64")
+		err = doSignRelease()
 	}
 
 	if argv.Everything != nil {
@@ -124,10 +126,38 @@ func main() {
 		s = "newest .deb files table: " + all.PrintTable()
 		log.Info("newest files are:", s)
 
+		err = doPurge()
+		if err != nil {
+			me.sh.BadExit("could not purge dists/", err)
+		}
+
 		// make and GPG sign the Release files
-		s, err = doRelease()
+		s, err = makePackagesFile("riscv64")
+		s, err = makePackagesFile("amd64")
+		s, err = makePackagesFile("arm64")
+		err = doSignRelease()
 	}
 
+	/*
+		add --update
+		cmd := []string{"apt-get", "update"}
+		cmd = append(cmd, "-o", "Dir::Etc::sourcelist=/etc/apt/sources.list.d/wit.list")
+		cmd = append(cmd, "-o", "Dir::Etc::sourceparts=/dev/null")
+		cmd = append(cmd, "-o", "APT::Get::List-Cleanup=0")
+		log.Info("apt update    :", cmd)
+		if argv.Update {
+			log.Info("")
+			shell.RunVerbose(cmd)
+			log.Info("")
+			log.Info("")
+		//	log.Info("Local     file:", "/var/lib/apt/lists/mirrors.wit.com_wit_dists_sid_main_binary-"+arch+"_Packages")
+		//	log.Info("")
+		//	shell.RunVerbose([]string{"head", "-n", "15", "/var/lib/apt/lists/mirrors.wit.com_wit_dists_sid_main_binary-" + arch + "_Packages"})
+		//	log.Info("apt install   :", "apt install wit-tools")
+		//	log.Info("")
+		}
+	*/
+
 	if err != nil {
 		me.sh.BadExit(s, err)
 	}
diff --git a/doRelease.go b/makePackagesFile.go
index f99e9e4..650a12c 100644
--- a/doRelease.go
+++ b/makePackagesFile.go
@@ -17,15 +17,22 @@ import (
 	"go.wit.com/log"
 )
 
-func doRelease() (string, error) {
+func doPurge() error {
 	// all paths should be relative to this BaseDir path
 	if err := os.Chdir(config.GetPanic("BaseDir")); err != nil {
 		log.Info("could not change to dir", config.GetPanic("BaseDir"), err)
 		panic("could not change to dir")
 	}
-	shell.RunVerbose([]string{"rm", "-rf", "dists"})
+	var err error
+	_, err = shell.RunVerbose([]string{"rm", "-rf", "dists"})
 
-	if err := os.MkdirAll("dists/sid/main/binary-amd64", 0755); err != nil {
+	return err
+}
+
+func makePackagesFile(arch string) (string, error) {
+	os.Chdir(config.GetPanic("BaseDir"))
+
+	if err := os.MkdirAll("dists/sid/main/binary-"+arch, 0755); err != nil {
 		log.Info("did not work", err)
 	} else {
 		log.Info("did work")
@@ -41,23 +48,26 @@ func doRelease() (string, error) {
 
 	log.Info("Processing dir", filepath.Join(me.pb.BaseDir, "pool"))
 
-	// arch := "amd64"
-
-	newest := doGetNewest("amd64")
+	newest := doGetNewest(arch)
 	newest.SortPackage()
 	thefile := debian.MakePackagesFile(newest)
-	fullname := "dists/sid/main/binary-amd64/Packages"
-	if err := os.WriteFile(fullname, []byte(thefile), os.ModePerm); err != nil {
+	fullname := "dists/sid/main/binary-" + arch + "/Packages"
+	if err := os.WriteFile(fullname, []byte(thefile), 0644); err != nil {
 		return fullname, err
 	}
 
 	r, err := shell.RunVerbose([]string{"gzip", "-k", fullname})
 	log.Info(r, err)
-	// r, err := shell.RunVerbose([]string{"gzip", fullname})
-	// panic("blah")
-	// shell.RunVerbose([]string{"bzip2", "-k", fullname})
-	// shell.RunVerbose([]string{"bzip2", fullname})
 
+	return fullname + " is created", err
+}
+
+// r, err := shell.RunVerbose([]string{"gzip", fullname})
+// panic("blah")
+// shell.RunVerbose([]string{"bzip2", "-k", fullname})
+// shell.RunVerbose([]string{"bzip2", fullname})
+
+func doSignRelease() error {
 	allfiles, _ := FindFiles("dists/sid/main")
 	for i, filename := range allfiles {
 		log.Info(i, filename)
@@ -133,31 +143,13 @@ func doRelease() (string, error) {
 			sum = fmt.Sprintf("%x", sha256.Sum256(fileBytes))
 	*/
 
-	log.Info("Package   file:", fullname)
 	log.Info("Release   file:", releasePath)
 	log.Info("InRelease file:", filepath.Join(distPath, "InRelease"))
-	cmd := []string{"apt-get", "update"}
-	cmd = append(cmd, "-o", "Dir::Etc::sourcelist=/etc/apt/sources.list.d/wit.list")
-	cmd = append(cmd, "-o", "Dir::Etc::sourceparts=/dev/null")
-	cmd = append(cmd, "-o", "APT::Get::List-Cleanup=0")
-	log.Info("apt update    :", cmd)
 	log.Info("")
 	log.Info("Finished Everything")
 	log.Info("")
 
-	if config.Verbose() {
-		log.Info("")
-		shell.RunVerbose(cmd)
-		log.Info("")
-		log.Info("")
-		log.Info("Local     file:", "/var/lib/apt/lists/mirrors.wit.com_wit_dists_sid_main_binary-amd64_Packages")
-		log.Info("")
-		shell.RunVerbose([]string{"head", "-n", "15", "/var/lib/apt/lists/mirrors.wit.com_wit_dists_sid_main_binary-amd64_Packages"})
-		log.Info("apt install   :", "apt install wit-tools")
-		log.Info("")
-	}
-
-	return "did everything", nil
+	return nil
 }
 
 func runCommand(cmd *exec.Cmd) error {