From 98e085c6f2509ab91c19ca95f49225d7fdc6ac6a Mon Sep 17 00:00:00 2001 From: Christian Goll Date: Wed, 25 May 2022 12:24:18 +0200 Subject: [PATCH] Trim 'ww' suffix on output --- internal/app/wwctl/overlay/parse/main.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/internal/app/wwctl/overlay/parse/main.go b/internal/app/wwctl/overlay/parse/main.go index 7d7384b7..0090ca3e 100644 --- a/internal/app/wwctl/overlay/parse/main.go +++ b/internal/app/wwctl/overlay/parse/main.go @@ -6,6 +6,7 @@ import ( "os" "path/filepath" "regexp" + "strings" "github.com/hpcng/warewulf/internal/pkg/node" "github.com/hpcng/warewulf/internal/pkg/overlay" @@ -52,31 +53,31 @@ func CobraRunE(cmd *cobra.Command, args []string) error { if filepath.Ext(args[0]) != ".ww" { wwlog.Printf(wwlog.WARN, "%s has not the '.ww' so wont be rendered if in overlay\n", args[0]) } - wwlog.Printf(wwlog.INFO, "backupFile: %v\nwriteFile: %v\n", backupFile, writeFile) var outBuffer bytes.Buffer // search for magic file name comment bufferScanner := bufio.NewScanner(bytes.NewReader(buffer.Bytes())) bufferScanner.Split(overlay.ScanLines) reg := regexp.MustCompile(`.*{{\s*/\*\s*file\s*["'](.*)["']\s*\*/\s*}}.*`) foundFileComment := false - destFileName := args[0] + destFileName := strings.TrimSuffix(args[0], ".ww") for bufferScanner.Scan() { line := bufferScanner.Text() filenameFromTemplate := reg.FindAllStringSubmatch(line, -1) if len(filenameFromTemplate) != 0 { wwlog.Printf(wwlog.DEBUG, "Found multifile comment, new filename %s\n", filenameFromTemplate[0][1]) if foundFileComment { + wwlog.Printf(wwlog.INFO, "backupFile: %v\nwriteFile: %v\n", backupFile, writeFile) + wwlog.Printf(wwlog.INFO, "Filename: %s\n\n", destFileName) wwlog.Printf(wwlog.INFO, "%s", outBuffer.String()) outBuffer.Reset() } destFileName = filenameFromTemplate[0][1] - wwlog.Printf(wwlog.INFO, "Filename: %s\n\n", destFileName) - wwlog.Printf(wwlog.INFO, "%s", outBuffer.String()) foundFileComment = true } else { _, _ = outBuffer.WriteString(line) } } + wwlog.Printf(wwlog.INFO, "backupFile: %v\nwriteFile: %v\n", backupFile, writeFile) wwlog.Printf(wwlog.INFO, "Filename: %s\n\n", destFileName) wwlog.Printf(wwlog.INFO, "%s", outBuffer.String()) return nil