diff --git a/cmd/mkpkg/main.go b/cmd/mkpkg/main.go index 92d934094..4b8a36a23 100644 --- a/cmd/mkpkg/main.go +++ b/cmd/mkpkg/main.go @@ -6,6 +6,7 @@ package main import ( + "flag" "fmt" "log" "os" @@ -14,7 +15,6 @@ import ( "github.com/goreleaser/nfpm" _ "github.com/goreleaser/nfpm/deb" _ "github.com/goreleaser/nfpm/rpm" - "github.com/pborman/getopt" ) // parseFiles parses a comma-separated list of colon-separated pairs @@ -44,21 +44,21 @@ func parseEmptyDirs(s string) []string { } func main() { - out := getopt.StringLong("out", 'o', "", "output file to write") - name := getopt.StringLong("name", 'n', "tailscale", "package name") - description := getopt.StringLong("description", 'd', "The easiest, most secure, cross platform way to use WireGuard + oauth2 + 2FA/SSO", "package description") - 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)") - 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") - emptyDirs := getopt.StringLong("emptydirs", 'E', "", "comma-separated list of empty directories") - version := getopt.StringLong("version", 0, "0.0.0", "version of the package") - postinst := getopt.StringLong("postinst", 0, "", "debian postinst script path") - prerm := getopt.StringLong("prerm", 0, "", "debian prerm script path") - postrm := getopt.StringLong("postrm", 0, "", "debian postrm script path") - replaces := getopt.StringLong("replaces", 0, "", "package which this package replaces, if any") - depends := getopt.StringLong("depends", 0, "", "comma-separated list of packages this package depends on") - getopt.Parse() + out := flag.String("out", "", "output file to write") + name := flag.String("name", "tailscale", "package name") + description := flag.String("description", "The easiest, most secure, cross platform way to use WireGuard + oauth2 + 2FA/SSO", "package description") + goarch := flag.String("arch", "amd64", "GOARCH this package is for") + pkgType := flag.String("type", "deb", "type of package to build (deb or rpm)") + files := flag.String("files", "", "comma-separated list of files in src:dst form") + configFiles := flag.String("configs", "", "like --files, but for files marked as user-editable config files") + emptyDirs := flag.String("emptydirs", "", "comma-separated list of empty directories") + version := flag.String("version", "0.0.0", "version of the package") + postinst := flag.String("postinst", "", "debian postinst script path") + prerm := flag.String("prerm", "", "debian prerm script path") + postrm := flag.String("postrm", "", "debian postrm script path") + replaces := flag.String("replaces", "", "package which this package replaces, if any") + depends := flag.String("depends", "", "comma-separated list of packages this package depends on") + flag.Parse() filesMap, err := parseFiles(*files) if err != nil { diff --git a/go.mod b/go.mod index c7826390d..47a9cfaaa 100644 --- a/go.mod +++ b/go.mod @@ -33,7 +33,6 @@ require ( github.com/mdlayher/sdnotify v1.0.0 github.com/miekg/dns v1.1.43 github.com/mitchellh/go-ps v1.0.0 - github.com/pborman/getopt v1.1.0 github.com/peterbourgon/ff/v3 v3.1.2 github.com/pkg/sftp v1.13.4 github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e diff --git a/go.sum b/go.sum index 2560a30b8..2b1078646 100644 --- a/go.sum +++ b/go.sum @@ -896,8 +896,6 @@ github.com/otiai10/curr v1.0.0/go.mod h1:LskTG5wDwr8Rs+nNQ+1LlxRjAtTZZjtJW4rMXl6 github.com/otiai10/mint v1.3.0/go.mod h1:F5AjcsTsWUqX+Na9fpHb52P8pcRX2CI6A3ctIT91xUo= github.com/otiai10/mint v1.3.1/go.mod h1:/yxELlJQ0ufhjUwhshSj+wFjZ78CnZ48/1wtmBH1OTc= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= -github.com/pborman/getopt v1.1.0 h1:eJ3aFZroQqq0bWmraivjQNt6Dmm5M0h2JcDW38/Azb0= -github.com/pborman/getopt v1.1.0/go.mod h1:FxXoW1Re00sQG/+KIkuSqRL/LwQgSkv7uyac+STFsbk= github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/pelletier/go-toml v1.6.0/go.mod h1:5N711Q9dKgbdkxHL+MEfF31hpT7l0S0s/t2kKREewys=