diff options
| -rw-r--r-- | cmd/yeet/internal/mkdeb/mkdeb.go | 8 | ||||
| -rw-r--r-- | cmd/yeet/internal/mkrpm/mkrpm.go | 8 | ||||
| -rw-r--r-- | cmd/yeet/internal/mktarball/mktarball.go | 11 | ||||
| -rw-r--r-- | cmd/yeet/main.go | 14 |
4 files changed, 13 insertions, 28 deletions
diff --git a/cmd/yeet/internal/mkdeb/mkdeb.go b/cmd/yeet/internal/mkdeb/mkdeb.go index 35d8c06..6da999a 100644 --- a/cmd/yeet/internal/mkdeb/mkdeb.go +++ b/cmd/yeet/internal/mkdeb/mkdeb.go @@ -17,12 +17,10 @@ import ( func Build(p pkgmeta.Package) (foutpath string, err error) { defer func() { if r := recover(); r != nil { - switch r.(type) { - case error: - err = r.(error) + if err, ok := r.(error); ok { slog.Error("mkrpm: error while building", "err", err) - default: - err = fmt.Errorf("mkrpm: error while building: %v", r) + } else { + err = fmt.Errorf("%v", r) slog.Error("mkrpm: error while building", "err", err) } } diff --git a/cmd/yeet/internal/mkrpm/mkrpm.go b/cmd/yeet/internal/mkrpm/mkrpm.go index 3816e9c..eae0778 100644 --- a/cmd/yeet/internal/mkrpm/mkrpm.go +++ b/cmd/yeet/internal/mkrpm/mkrpm.go @@ -17,12 +17,10 @@ import ( func Build(p pkgmeta.Package) (foutpath string, err error) { defer func() { if r := recover(); r != nil { - switch r.(type) { - case error: - err = r.(error) + if err, ok := r.(error); ok { slog.Error("mkrpm: error while building", "err", err) - default: - err = fmt.Errorf("mkrpm: error while building: %v", r) + } else { + err = fmt.Errorf("%v", r) slog.Error("mkrpm: error while building", "err", err) } } diff --git a/cmd/yeet/internal/mktarball/mktarball.go b/cmd/yeet/internal/mktarball/mktarball.go index 5855403..1133d4f 100644 --- a/cmd/yeet/internal/mktarball/mktarball.go +++ b/cmd/yeet/internal/mktarball/mktarball.go @@ -17,11 +17,9 @@ import ( func Build(p pkgmeta.Package) (foutpath string, err error) { defer func() { if r := recover(); r != nil { - switch r.(type) { - case error: - err = r.(error) + if err, ok := r.(error); ok { slog.Error("mkrpm: error while building", "err", err) - default: + } else { err = fmt.Errorf("%v", r) slog.Error("mkrpm: error while building", "err", err) } @@ -73,8 +71,6 @@ func Build(p pkgmeta.Package) (foutpath string, err error) { os.Setenv("GOOS", p.Platform) os.Setenv("CGO_ENABLED", "0") - os.WriteFile(filepath.Join(pkgDir, "VERSION"), []byte(p.Version+"\n"), 0666) - bi := pkgmeta.BuildInput{ Output: pkgDir, Bin: filepath.Join(pkgDir, "bin"), @@ -84,6 +80,9 @@ func Build(p pkgmeta.Package) (foutpath string, err error) { Systemd: filepath.Join(pkgDir, "run"), } + os.MkdirAll(bi.Doc, 0755) + os.WriteFile(filepath.Join(bi.Doc, "VERSION"), []byte(p.Version+"\n"), 0666) + p.Build(bi) for src, dst := range p.ConfigFiles { diff --git a/cmd/yeet/main.go b/cmd/yeet/main.go index 6eca911..f574f04 100644 --- a/cmd/yeet/main.go +++ b/cmd/yeet/main.go @@ -26,9 +26,8 @@ import ( ) var ( - fname = flag.String("fname", "yeetfile.js", "filename for the yeetfile") - flyctl = flag.String("flyctl-path", flyctlPath(), "path to flyctl binary") - protocPath = flag.String("protoc-path", "protoc", "path to protoc binary") + fname = flag.String("fname", "yeetfile.js", "filename for the yeetfile") + flyctl = flag.String("flyctl-path", flyctlPath(), "path to flyctl binary") ) func flyctlPath() string { @@ -149,15 +148,6 @@ func hostname() string { return result } -type protocInput struct { - Input string `json:"input"` - Output string `json:"output"` - Kinds []struct { - Kind string `json:"kind"` - Opt string `json:"opt"` - } `json:"kinds"` -} - func main() { internal.HandleStartup() |