Merge pull request #133 from l27001/manual_fix

Bugfix: Copy manual*.conf to cache dir

Author: natesales

pkg/process/process.go

@@ -635,9 +635,19 @@ func Run(configFilename, lockFile, version string, noConfigure, dryRun, withdraw
 	}
 	log.Debug("Finished writing global config file")
 
+	// Remove old manual configs
+	if err := util.RemoveFileGlob(path.Join(c.CacheDirectory, "manual*.conf")); err != nil {
+		log.Fatalf("Removing old manual config files: %v", err)
+	}
+
+	// Copying manual configs
+	if err := util.CopyFileGlob(path.Join(c.BIRDDirectory, "manual*.conf"), c.CacheDirectory); err != nil {
+		log.Fatalf("Copying manual config files: %v", err)
+	}
+
 	// Remove old peer-specific configs
 	if err := util.RemoveFileGlob(path.Join(c.CacheDirectory, "AS*.conf")); err != nil {
-		log.Fatalf("Removing old config files: %v", err)
+		log.Fatalf("Removing old peer config files: %v", err)
 	}
 
 	// Print global config

pkg/util/util.go

@@ -142,3 +142,54 @@ func StrDeref(s *string) string {
 func Ptr[T any](a T) *T {
 	return &a
 }
+
+// CopyFile copies a file from a source to destination
+func CopyFile(source, destination_dir string) (err error) {
+	_, destination := filepath.Split(source)
+	destination = filepath.Join(destination_dir, destination)
+	src, err := os.Open(source)
+	if err != nil {
+		return err
+	}
+	defer src.Close()
+	fi, err := src.Stat()
+	if err != nil {
+		return err
+	}
+	flag := os.O_WRONLY | os.O_CREATE | os.O_TRUNC
+	perm := fi.Mode() & os.ModePerm
+	dst, err := os.OpenFile(destination, flag, perm)
+	if err != nil {
+		return err
+	}
+	defer dst.Close()
+	_, err = io.Copy(dst, src)
+	if err != nil {
+		dst.Close()
+		os.Remove(destination)
+		return err
+	}
+	err = dst.Close()
+	if err != nil {
+		return err
+	}
+	err = src.Close()
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+// CopyFileGlob copies files by glob
+func CopyFileGlob(glob, destination_dir string) error {
+	files, err := filepath.Glob(glob)
+	if err != nil {
+		log.Fatal(err)
+	}
+	for _, f := range files {
+		if err := CopyFile(f, destination_dir); err != nil {
+			return err
+		}
+	}
+	return nil
+}