From 5dfd1e37875c251b2dc3cf00a086298b48ae5ac8 Mon Sep 17 00:00:00 2001 From: Clayton Craft Date: Sat, 4 Sep 2021 23:45:44 -0700 Subject: [PATCH] use flag module from std lib for parsing cmdline args The getopt thing was an experiment, and I'd rather lose external dependencies than use getopt-like parsing especially since the only argument this app takes is largely for testing/development purposes only. --- go.mod | 1 - go.sum | 3 --- main.go | 14 +++++--------- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/go.mod b/go.mod index b56e130..55232da 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,6 @@ module gitlab.com/postmarketOS/postmarketos-mkinitfs go 1.16 require ( - git.sr.ht/~sircmpwn/getopt v0.0.0-20201218204720-9961a9c6298f github.com/cavaliercoder/go-cpio v0.0.0-20180626203310-925f9528c45e github.com/klauspost/compress v1.13.3 // indirect github.com/klauspost/pgzip v1.2.5 diff --git a/go.sum b/go.sum index 7497d44..b1b114c 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,3 @@ -git.sr.ht/~sircmpwn/getopt v0.0.0-20201218204720-9961a9c6298f h1:f5axCdaRzGDCihN3o1Lq0ydn0VlkhY+11G0JOyY5qss= -git.sr.ht/~sircmpwn/getopt v0.0.0-20201218204720-9961a9c6298f/go.mod h1:wMEGFFFNuPos7vHmWXfszqImLppbc0wEhh6JBfJIUgw= github.com/cavaliercoder/go-cpio v0.0.0-20180626203310-925f9528c45e h1:hHg27A0RSSp2Om9lubZpiMgVbvn39bsUmW9U5h0twqc= github.com/cavaliercoder/go-cpio v0.0.0-20180626203310-925f9528c45e/go.mod h1:oDpT4efm8tSYHXV5tHSdRvBet/b/QzxZ+XyyPehvm3A= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= @@ -14,7 +12,6 @@ github.com/pelletier/go-toml/v2 v2.0.0-beta.3/go.mod h1:aNseLYu/uKskg0zpr/kbr2z8 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.7.1-0.20210427113832-6241f9ab9942 h1:t0lM6y/M5IiUZyvbBTcngso8SZEZICH7is9B6g/obVU= github.com/stretchr/testify v1.7.1-0.20210427113832-6241f9ab9942/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c h1:F1jZWGFhYfh0Ci55sIpILtKKK8p3i2/krTr0H1rg74I= diff --git a/main.go b/main.go index 6bbf2a6..68f0114 100644 --- a/main.go +++ b/main.go @@ -7,6 +7,7 @@ import ( "bufio" "debug/elf" "errors" + "flag" "fmt" "io" "io/ioutil" @@ -17,7 +18,6 @@ import ( "strings" "time" - "git.sr.ht/~sircmpwn/getopt" "gitlab.com/postmarketOS/postmarketos-mkinitfs/pkgs/archive" "gitlab.com/postmarketOS/postmarketos-mkinitfs/pkgs/deviceinfo" "gitlab.com/postmarketOS/postmarketos-mkinitfs/pkgs/misc" @@ -37,12 +37,8 @@ func main() { return } - var outDir string - getopt.StringVar(&outDir, "d", "/boot", "Directory to output initfs(-extra) and other boot files, default: /boot") - - if err := getopt.Parse(); err != nil { - log.Fatal(err) - } + outDir := flag.String("d", "/boot", "Directory to output initfs(-extra) and other boot files") + flag.Parse() defer timeFunc(time.Now(), "mkinitfs") @@ -63,7 +59,7 @@ func main() { defer os.RemoveAll(workDir) log.Print("Generating for kernel version: ", kernVer) - log.Print("Output directory: ", outDir) + log.Print("Output directory: ", *outDir) if err := generateInitfs("initramfs", workDir, kernVer, devinfo); err != nil { log.Fatal("generateInitfs: ", err) @@ -74,7 +70,7 @@ func main() { } // Final processing of initramfs / kernel is done by boot-deploy - if err := bootDeploy(workDir, outDir); err != nil { + if err := bootDeploy(workDir, *outDir); err != nil { log.Fatal("bootDeploy: ", err) }