mirror/nfpm
1
1
Fork 0
mirror of https://github.com/goreleaser/nfpm synced 2025-04-30 14:18:01 +02:00
Code Issues Releases Activity

fix: deb: do not create multiple entries for the same folder

Browse Source
This commit is contained in:
Carlos Alexandro Becker 2018-02-25 15:17:55 -03:00
parent 4ece0503a8
commit 1ae64d6aa4
No known key found for this signature in database
GPG Key ID: E61E2F7DC14AB940
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
deb/deb.go
View File

@ -80,13 +80,15 @@ func createDataTarGz(info nfpm.Info) (dataTarGz, md5sums []byte, instSize int64,
defer out.Close() // nolint: errcheck
defer compress.Close() // nolint: errcheck
var created = map[string]bool{}
var md5buf bytes.Buffer
for _, files := range []map[string]string{
info.Files,
info.ConfigFiles,
} {
for src, dst := range files {
if err := createTree(out, dst); err != nil {
if err := createTree(out, dst, created); err != nil {
return nil, nil, 0, err
}
size, err := copyToTarAndDigest(out, &md5buf, src, dst)
@ -109,8 +111,13 @@ func createDataTarGz(info nfpm.Info) (dataTarGz, md5sums []byte, instSize int64,
// this is needed because the data.tar.gz file should have the empty folders
// as well, so we walk through the dst and create all subfolders.
func createTree(tarw *tar.Writer, dst string) error {
func createTree(tarw *tar.Writer, dst string, created map[string]bool) error {
for _, path := range pathsToCreate(dst) {
if created[path] {
// skipping dir that was previously created inside the archive
// (eg: usr/)
continue
}
if err := tarw.WriteHeader(&tar.Header{
Name: path + "/",
Mode: 0755,
@ -120,6 +127,7 @@ func createTree(tarw *tar.Writer, dst string) error {
}); err != nil {
return errors.Wrap(err, "failed to create folder")
}
created[path] = true
}
return nil
}
@ -155,6 +163,7 @@ func copyToTarAndDigest(tarw *tar.Writer, md5w io.Writer, src, dst string) (int6
return 0, err
}
if info.IsDir() {
// TODO: this should probably return an error
return 0, nil
}
var header = tar.Header{