aboutsummaryrefslogtreecommitdiff
path: root/cmd/yeet/internal
diff options
context:
space:
mode:
Diffstat (limited to 'cmd/yeet/internal')
-rw-r--r--cmd/yeet/internal/mkdeb/mkdeb.go8
-rw-r--r--cmd/yeet/internal/mkrpm/mkrpm.go8
-rw-r--r--cmd/yeet/internal/mktarball/mktarball.go11
3 files changed, 11 insertions, 16 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 {