Skip .DS_Store folder and swp files (ViM) in the build command #2471
Conversation
internal/files/copy.go
Outdated
| regexesFiles := []*regexp.Regexp{} | ||
| for _, regexFile := range skippedFiles { | ||
| r, err := regexp.Compile(regexFile) | ||
| if err != nil { | ||
| return fmt.Errorf("failed to compile regex %q: %w", r, err) | ||
| } | ||
| regexesFiles = append(regexesFiles, r) | ||
| } |
There was a problem hiding this comment.
Pre-compile all regexes before calling to the Walk() function
There was a problem hiding this comment.
Maybe this function can directly receive compiled regexps. Or would it be enough to use glob patterns instead of regexes?
There was a problem hiding this comment.
Updated the code to use glob patterns instead of regexes: b91048e
As everything should be file names glob, patterns should be enough.
internal/files/copy.go
Outdated
| } | ||
|
|
||
| // CopyWithoutDev method copies files from the source to the destination, but skips _dev directories and empty folders. | ||
| func CopyWithoutDev(sourcePath, destinationPath string) error { | ||
| return CopyWithSkipped(sourcePath, destinationPath, []string{"_dev", "build", ".git"}) | ||
| return CopyWithSkipped(sourcePath, destinationPath, []string{"_dev", "build", ".git"}, []string{"\\.DS_Store", "\\..*\\.swp"}) |
There was a problem hiding this comment.
Added support to skip files based on their file names if they match some of these regexes.
|
/test |
|
/test |
internal/files/copy.go
Outdated
| } | ||
|
|
||
| // CopyWithoutDev method copies files from the source to the destination, but skips _dev directories and empty folders. | ||
| func CopyWithoutDev(sourcePath, destinationPath string) error { | ||
| return CopyWithSkipped(sourcePath, destinationPath, []string{"_dev", "build", ".git"}) | ||
| return CopyWithSkipped(sourcePath, destinationPath, []string{"_dev", "build", ".git"}, []string{"^\\.DS_Store$", "^\\..*\\.swp$"}) |
There was a problem hiding this comment.
Nit. Move these lists of dirs and patterns to variables.
There was a problem hiding this comment.
Created const definitions here b91048e
internal/files/copy.go
Outdated
| regexesFiles := []*regexp.Regexp{} | ||
| for _, regexFile := range skippedFiles { | ||
| r, err := regexp.Compile(regexFile) | ||
| if err != nil { | ||
| return fmt.Errorf("failed to compile regex %q: %w", r, err) | ||
| } | ||
| regexesFiles = append(regexesFiles, r) | ||
| } |
There was a problem hiding this comment.
Maybe this function can directly receive compiled regexps. Or would it be enough to use glob patterns instead of regexes?
💚 Build Succeeded
History
cc @mrodm |
Closes #2463
Add exceptions to skip some hidden files when running
elastic-package build.This PR skips the copy to the build directory (and zip file) the following files (using glob patterns):
.DS_Storefiles created in macOS.*.swpfiles created by ViMHow to test this PR locally