fix(archlinux): .MTREE should have parent dirs as well (#645)

* fix(archlinux): .MTREE should have parent dirs as well Signed-off-by: Carlos Alexandro Becker <caarlos0@users.noreply.github.com> * fix: files Co-Authored-By: Co-authored-by: Erik Geiser <erik.geiser@posteo.net> Signed-off-by: Carlos A Becker <caarlos0@users.noreply.github.com> * fix: code, test Co-Authored-By: Co-authored-by: Erik Geiser <erik.geiser@posteo.net> Signed-off-by: Carlos A Becker <caarlos0@users.noreply.github.com> * fix: perm Signed-off-by: Carlos A Becker <caarlos0@users.noreply.github.com> --------- Signed-off-by: Carlos Alexandro Becker <caarlos0@users.noreply.github.com> Signed-off-by: Carlos A Becker <caarlos0@users.noreply.github.com> Co-authored-by: Co-authored-by: Erik Geiser <erik.geiser@posteo.net>
goreleaser · Apr 6, 2023 · 3f95279 · 3f95279
1 parent 5d25139
commit 3f95279
Show file tree

Hide file tree

Showing 2 changed files with 70 additions and 13 deletions.
diff --git a/arch/arch.go b/arch/arch.go
@@ -174,14 +174,12 @@ func createFilesInTar(info *nfpm.Info, tw *tar.Writer) ([]MtreeEntry, int64, err
 
 		switch content.Type {
 		case files.TypeDir, files.TypeImplicitDir:
-			if content.Type == files.TypeDir {
-				entries = append(entries, MtreeEntry{
-					Destination: content.Destination,
-					Time:        content.ModTime().Unix(),
-					Mode:        int64(content.Mode()),
-					Type:        files.TypeDir,
-				})
-			}
+			entries = append(entries, MtreeEntry{
+				Destination: content.Destination,
+				Time:        content.ModTime().Unix(),
+				Mode:        int64(content.Mode()),
+				Type:        files.TypeDir,
+			})
 
 			err := tw.WriteHeader(&tar.Header{
 				Name:     content.Destination,
@@ -453,7 +451,7 @@ type MtreeEntry struct {
 
 func (me *MtreeEntry) WriteTo(w io.Writer) (int64, error) {
 	switch me.Type {
-	case files.TypeDir:
+	case files.TypeDir, files.TypeImplicitDir:
 		n, err := fmt.Fprintf(
 			w,
 			"./%s time=%d.0 mode=%o type=dir\n",

diff --git a/arch/arch_test.go b/arch/arch_test.go
@@ -5,11 +5,13 @@ import (
 	"bytes"
 	"io"
 	"os"
+	"regexp"
 	"strings"
 	"testing"
 
 	"github.com/goreleaser/nfpm/v2"
 	"github.com/goreleaser/nfpm/v2/files"
+	"github.com/klauspost/compress/zstd"
 	"github.com/klauspost/pgzip"
 	"github.com/stretchr/testify/require"
 )
@@ -249,7 +251,8 @@ func extractPkginfoFields(data []byte) map[string]string {
 }
 
 const correctMtree = `#mtree
-./foo time=1234.0 mode=755 type=dir
+./foo/bar time=1234.0 mode=755 type=dir
+./foo/bar/file time=1234.0 mode=600 size=143 type=file md5digest=abcd sha256digest=ef12
 ./3 time=12345.0 mode=644 size=100 type=file md5digest=abcd sha256digest=ef12
 ./sh time=123456.0 mode=777 type=link link=/bin/bash
 `
@@ -263,11 +266,20 @@ func TestArchMtree(t *testing.T) {
 
 	err := createMtree(tw, []MtreeEntry{
 		{
-			Destination: "foo",
+			Destination: "foo/bar",
 			Time:        1234,
 			Type:        files.TypeDir,
 			Mode:        0o755,
 		},
+		{
+			Destination: "foo/bar/file",
+			Time:        1234,
+			Type:        files.TypeFile,
+			Mode:        0o600,
+			Size:        143,
+			MD5:         []byte{0xAB, 0xCD},
+			SHA256:      []byte{0xEF, 0x12},
+		},
 		{
 			Destination: "3",
 			Time:        12345,
@@ -304,6 +316,7 @@ func TestArchMtree(t *testing.T) {
 }
 
 func TestGlob(t *testing.T) {
+	var pkg bytes.Buffer
 	require.NoError(t, Default.Package(nfpm.WithDefaults(&nfpm.Info{
 		Name:       "nfpm-repro",
 		Version:    "1.0.0",
@@ -313,9 +326,55 @@ func TestGlob(t *testing.T) {
 			Contents: files.Contents{
 				{
 					Destination: "/usr/share/nfpm-repro",
-					Source:      "../files/*",
+					Source:      "../files/*.go",
 				},
 			},
 		},
-	}), io.Discard))
+	}), &pkg))
+
+	pkgZstd, err := zstd.NewReader(&pkg)
+	require.NoError(t, err)
+	t.Cleanup(func() { pkgZstd.Close() })
+	pkgTar := tar.NewReader(pkgZstd)
+	for {
+		f, err := pkgTar.Next()
+		if err == io.EOF || f == nil {
+			break
+		}
+
+		if f.Name == ".MTREE" {
+			break
+		}
+	}
+
+	mtreeTarBts, err := io.ReadAll(pkgTar)
+	require.NoError(t, err)
+
+	mtreeGzip, err := pgzip.NewReader(bytes.NewReader(mtreeTarBts))
+	require.NoError(t, err)
+	t.Cleanup(func() { require.NoError(t, mtreeGzip.Close()) })
+
+	mtreeContentBts, err := io.ReadAll(mtreeGzip)
+	require.NoError(t, err)
+
+	expected := map[string][]string{
+		"./.PKGINFO":                           {"mode=644", "size=188", "type=file"},
+		"./usr/":                               {"mode=755", "type=dir"},
+		"./usr/share/":                         {"mode=755", "type=dir"},
+		"./usr/share/nfpm-repro/":              {"mode=755", "type=dir"},
+		"./usr/share/nfpm-repro/files.go":      {"mode=644", "size=15688", "type=file", "md5digest=e4c9ce32dba277aae42fb8ec59e29a3a", "sha256digest=7946f60272c8f42c87cd3a3832d80f0b57ed9406aa1db6b96e5df6003922060b"},
+		"./usr/share/nfpm-repro/files_test.go": {"mode=644", "size=16947", "type=file", "md5digest=4824b1a82a0f694a976345fff8a6aa1f", "sha256digest=3cb4b25fe2343bf509a2d82ece2881ec92ecd4962e50bc855f27d621a5613d47"},
+	}
+
+	for _, line := range strings.Split(string(mtreeContentBts), "\n") {
+		if line == "#mtree" || line == "" {
+			continue
+		}
+		parts := strings.Fields(line)
+		filename := parts[0]
+		expect := expected[filename]
+		modTime := parts[1]
+		require.Regexp(t, regexp.MustCompile(`time=\d+\.\d`), modTime)
+		require.Equal(t, expect, parts[2:len(expect)+2], filename)
+	}
 }