lzc256
/
tailscale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cmd/mkpkg: support adding empty directories. 

Signed-off-by: Dmytro Shynkevych <dmytro@tailscale.com>
reviewable/pr352/r1
Dmytro Shynkevych 2020-05-04 16:10:14 -04:00 committed by Dmytro Shynkevych
parent 3b546dc29a
commit 68a173bc24
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cmd/mkpkg/main.go
View File

@ -31,12 +31,22 @@ func parseFiles(s string) (map[string]string, error) {
return ret, nil return ret, nil
} }
func parseEmptyDirs(s string) []string {
// strings.Split("", ",") would return []string{""}, which is not suitable:
// this would create an empty dir record with path "", breaking the package
if s == "" {
return nil
}
return strings.Split(s, ",")
}
func main() { func main() {
out := getopt.StringLong("out", 'o', "", "output file to write") out := getopt.StringLong("out", 'o', "", "output file to write")
goarch := getopt.StringLong("arch", 'a', "amd64", "GOARCH this package is for") goarch := getopt.StringLong("arch", 'a', "amd64", "GOARCH this package is for")
pkgType := getopt.StringLong("type", 't', "deb", "type of package to build (deb or rpm)") pkgType := getopt.StringLong("type", 't', "deb", "type of package to build (deb or rpm)")
files := getopt.StringLong("files", 'F', "", "comma-separated list of files in src:dst form") files := getopt.StringLong("files", 'F', "", "comma-separated list of files in src:dst form")
configFiles := getopt.StringLong("configs", 'C', "", "like --files, but for files marked as user-editable config files") configFiles := getopt.StringLong("configs", 'C', "", "like --files, but for files marked as user-editable config files")
emptyDirs := getopt.StringLong("emptydirs", 'E', "", "comma-separated list of empty directories")
version := getopt.StringLong("version", 0, "0.0.0", "version of the package") version := getopt.StringLong("version", 0, "0.0.0", "version of the package")
postinst := getopt.StringLong("postinst", 0, "", "debian postinst script path") postinst := getopt.StringLong("postinst", 0, "", "debian postinst script path")
prerm := getopt.StringLong("prerm", 0, "", "debian prerm script path") prerm := getopt.StringLong("prerm", 0, "", "debian prerm script path")
@ -53,6 +63,7 @@ func main() {
if err != nil { if err != nil {
log.Fatalf("Parsing --configs: %v", err) log.Fatalf("Parsing --configs: %v", err)
} }
emptyDirList := parseEmptyDirs(*emptyDirs)
info := nfpm.WithDefaults(&nfpm.Info{ info := nfpm.WithDefaults(&nfpm.Info{
Name: "tailscale", Name: "tailscale",
Arch: *goarch, Arch: *goarch,
@ -63,6 +74,7 @@ func main() {
Homepage: "https://www.tailscale.com", Homepage: "https://www.tailscale.com",
License: "MIT", License: "MIT",
Overridables: nfpm.Overridables{ Overridables: nfpm.Overridables{
EmptyFolders: emptyDirList,
Files: filesMap, Files: filesMap,
ConfigFiles: configsMap, ConfigFiles: configsMap,
Scripts: nfpm.Scripts{ Scripts: nfpm.Scripts{