Skip to content

feat: Preserve file modebits when creating project #291

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
GrooveStomp merged 1 commit into from
Sep 30, 2020
Merged

feat: Preserve file modebits when creating project #291

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions internal/generate/generate_modules.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ func Generate(projectConfig projectconfig.ZeroProjectConfig) error {
type fileConfig struct {
source string
destination string
modeBits os.FileMode
}

// sortFileType walks the module directory to find and classify all files into bin / text/plain (non-bin) types.
Expand Down Expand Up @@ -94,6 +95,11 @@ func sortFileType(moduleDir string, outputDir string, overwrite bool) ([]*fileCo
}
}

fileInfo, err := os.Stat(path)
if err != nil {
panic(err)
}

// detect the file type
detectedMIME, err := mimetype.DetectFile(path)
if err != nil {
Expand All @@ -112,13 +118,15 @@ func sortFileType(moduleDir string, outputDir string, overwrite bool) ([]*fileCo
binTypeFiles = append(binTypeFiles, &fileConfig{
source: path,
destination: outputPath,
modeBits: fileInfo.Mode().Perm(),
})
continue
}

txtTypeFiles = append(txtTypeFiles, &fileConfig{
source: path,
destination: outputPath,
modeBits: fileInfo.Mode().Perm(),
})
}
return txtTypeFiles, binTypeFiles
Expand Down Expand Up @@ -169,6 +177,12 @@ func executeTemplates(templates []*fileConfig, data interface{}, delimiters []st
if err != nil {
flog.Errorf("Error initializing file '%s'", err)
}

err = f.Chmod(tmpltConfig.modeBits)
if err != nil {
flog.Errorf("Error changing mode bits '%s'", err)
}

// @TODO if strict mode then only copy file
name := path.Base(source)
template, err := template.New(name).Delims(leftDelim, rightDelim).Funcs(util.FuncMap).ParseFiles(source)
Expand All @@ -185,7 +199,6 @@ func executeTemplates(templates []*fileConfig, data interface{}, delimiters []st
}

func copyBinFiles(binTypeFiles []*fileConfig) {

for _, binFile := range binTypeFiles {
source := binFile.source
dest := binFile.destination
Expand All @@ -204,7 +217,7 @@ func copyBinFiles(binTypeFiles []*fileConfig) {
}
defer from.Close()

to, err := os.OpenFile(dest, os.O_RDWR|os.O_CREATE, 0666)
to, err := os.OpenFile(dest, os.O_RDWR|os.O_CREATE, binFile.modeBits)
if err != nil {
log.Fatal(err)
flog.Errorf("Error creating file '%s': %v", dest, err)
Expand Down