fix: archlinux globs (#574)

Signed-off-by: Carlos A Becker <caarlos0@users.noreply.github.com> Signed-off-by: Carlos A Becker <caarlos0@users.noreply.github.com>
goreleaser · Nov 12, 2022 · 5c3cc38 · 5c3cc38
1 parent e1d35a1
commit 5c3cc38
Show file tree

Hide file tree

Showing 6 changed files with 75 additions and 4 deletions.
diff --git a/apk/apk_test.go b/apk/apk_test.go
@@ -722,3 +722,20 @@ func TestArches(t *testing.T) {
 		require.Equal(t, "foo64", info.Arch)
 	})
 }
+
+func TestGlob(t *testing.T) {
+	require.NoError(t, Default.Package(nfpm.WithDefaults(&nfpm.Info{
+		Name:       "nfpm-repro",
+		Version:    "1.0.0",
+		Maintainer: "asdfasdf",
+
+		Overridables: nfpm.Overridables{
+			Contents: files.Contents{
+				{
+					Destination: "/usr/share/nfpm-repro",
+					Source:      "../files/*",
+				},
+			},
+		},
+	}), io.Discard))
+}
diff --git a/arch/arch.go b/arch/arch.go
@@ -115,6 +115,10 @@ func isOneOf(r rune, rr ...rune) bool {
 
 // Package writes a new archlinux package to the given writer using the given info.
 func (ArchLinux) Package(info *nfpm.Info, w io.Writer) error {
+	if err := info.Validate(); err != nil {
+		return err
+	}
+
 	if !nameIsValid(info.Name) {
 		return ErrInvalidPkgName
 	}

diff --git a/arch/arch_test.go b/arch/arch_test.go
@@ -286,3 +286,20 @@ func TestArchMtree(t *testing.T) {
 
 	require.InDeltaSlice(t, []byte(correctMtree), mtree, 0)
 }
+
+func TestGlob(t *testing.T) {
+	require.NoError(t, Default.Package(nfpm.WithDefaults(&nfpm.Info{
+		Name:       "nfpm-repro",
+		Version:    "1.0.0",
+		Maintainer: "asdfasdf",
+
+		Overridables: nfpm.Overridables{
+			Contents: files.Contents{
+				{
+					Destination: "/usr/share/nfpm-repro",
+					Source:      "../files/*",
+				},
+			},
+		},
+	}), io.Discard))
+}
diff --git a/deb/deb_test.go b/deb/deb_test.go
@@ -1367,3 +1367,20 @@ func TestFields(t *testing.T) {
 	require.NoError(t, err)
 	require.Equal(t, string(bts), w.String())
 }
+
+func TestGlob(t *testing.T) {
+	require.NoError(t, Default.Package(nfpm.WithDefaults(&nfpm.Info{
+		Name:       "nfpm-repro",
+		Version:    "1.0.0",
+		Maintainer: "asdfasdf",
+
+		Overridables: nfpm.Overridables{
+			Contents: files.Contents{
+				{
+					Destination: "/usr/share/nfpm-repro",
+					Source:      "../files/*",
+				},
+			},
+		},
+	}), io.Discard))
+}
diff --git a/internal/cmd/package.go b/internal/cmd/package.go
@@ -92,16 +92,15 @@ func doPackage(configPath, target, packager string) error {
 	if err != nil {
 		return err
 	}
+	defer f.Close()
 
 	info.Target = target
 
-	err = pkg.Package(info, f)
-	_ = f.Close()
-	if err != nil {
+	if err := pkg.Package(info, f); err != nil {
 		os.Remove(target)
 		return err
 	}
 
 	fmt.Printf("created package: %s\n", target)
-	return nil
+	return f.Close()
 }
diff --git a/rpm/rpm_test.go b/rpm/rpm_test.go
@@ -848,6 +848,23 @@ func TestDirectories(t *testing.T) {
 	require.Equal(t, h.Mode(), int(tagDirectory|0o700))
 }
 
+func TestGlob(t *testing.T) {
+	require.NoError(t, Default.Package(nfpm.WithDefaults(&nfpm.Info{
+		Name:       "nfpm-repro",
+		Version:    "1.0.0",
+		Maintainer: "asdfasdf",
+
+		Overridables: nfpm.Overridables{
+			Contents: files.Contents{
+				{
+					Destination: "/usr/share/nfpm-repro",
+					Source:      "../files/*",
+				},
+			},
+		},
+	}), io.Discard))
+}
+
 func extractFileFromRpm(rpm []byte, filename string) ([]byte, error) {
 	rpmFile, err := rpmutils.ReadRpm(bytes.NewReader(rpm))
 	if err != nil {