From d17e048e5fff060783fb904e0f70697012cead33 Mon Sep 17 00:00:00 2001 From: Dj Gilcrease Date: Wed, 30 Oct 2019 13:56:34 -0700 Subject: [PATCH] fix(#95): resolve empty dir permission issues and readd the MTime back to the files and directories in the RPM (#96) --- rpm/rpm.go | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/rpm/rpm.go b/rpm/rpm.go index 4452ac7..b8ff15e 100644 --- a/rpm/rpm.go +++ b/rpm/rpm.go @@ -6,6 +6,7 @@ import ( "io" "io/ioutil" "os" + "time" "github.com/google/rpmpack" "github.com/pkg/errors" @@ -180,8 +181,9 @@ func addEmptyDirsRPM(info *nfpm.Info, rpm *rpmpack.RPM) { for _, dir := range info.EmptyFolders { rpm.AddFile( rpmpack.RPMFile{ - Name: dir, - Mode: uint(1 | 040000), + Name: dir, + Mode: uint(040755), + MTime: uint32(time.Now().Unix()), }, ) } @@ -236,9 +238,10 @@ func copyToRPM(rpm *rpmpack.RPM, src, dst string, config bool) error { } rpmFile := rpmpack.RPMFile{ - Name: dst, - Body: data, - Mode: uint(info.Mode()), + Name: dst, + Body: data, + Mode: uint(info.Mode()), + MTime: uint32(info.ModTime().Unix()), } if config {