fix(#103): ensure the package is not included in itself (#104)

* fix(#103): ensure the package is not included in itself when using globs to match files

* chore: switch strings.Contains to strings.HasSuffix

CONTRIBUTING.md

@@ -32,6 +32,12 @@ A good way of making sure everything is all right is running the test suite:
 $ make test
 ```
 
+If on the ARM tests you are seeing `standard_init_linux.go:211: exec user process caused "exec format error"`:
+
+```console
+$sudo docker run --rm --privileged hypriot/qemu-register
+```
+
 ## Test your change
 
 You can create a branch for your changes and try to build from the source as you go:

acceptance/acceptance_test.go

@@ -194,6 +194,7 @@ func accept(t *testing.T, params acceptParms) {
 
 	f, err := os.Create(target)
 	require.NoError(t, err)
+	info.Target = target
 	require.NoError(t, pkg.Package(nfpm.WithDefaults(info), f))
 	//nolint:gosec
 	cmd := exec.Command(

cmd/nfpm/main.go

@@ -83,6 +83,8 @@ func doPackage(path, target string) error {
 	if err != nil {
 		return err
 	}
+
+	info.Target = target
 	return pkg.Package(info, f)
 }
 

deb/deb.go

@@ -131,6 +131,9 @@ func createFilesInsideTarGz(info *nfpm.Info, out *tar.Writer, created map[string
 				return md5buf, 0, err
 			}
 			for src, dst := range globbed {
+				if strings.HasSuffix(src, info.Target) {
+					continue
+				}
 				if err := createTree(out, dst, created); err != nil {
 					return md5buf, 0, err
 				}

nfpm.go

@@ -119,6 +119,7 @@ type Info struct {
 	Homepage     string `yaml:"homepage,omitempty"`
 	License      string `yaml:"license,omitempty"`
 	Bindir       string `yaml:"bindir,omitempty"`
+	Target       string `yaml:"-"`
 }
 
 // Overridables contain the field which are overridable in a package

rpm/rpm.go

@@ -3,6 +3,7 @@
 package rpm
 
 import (
+	"fmt"
 	"io"
 	"io/ioutil"
 	"os"
@@ -199,6 +200,10 @@ func createFilesInsideRPM(info *nfpm.Info, rpm *rpmpack.RPM) error {
 				return err
 			}
 			for src, dst := range globbed {
+				if strings.HasSuffix(src, info.Target) {
+					fmt.Println("skipping", src)
+					continue
+				}
 				err := copyToRPM(rpm, src, dst, config)
 				if err != nil {
 					return err