lure
/
lure
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases 13 Activity

Pass required variables to helper commands invoked by lure helper
ci/woodpecker/push/woodpecker Pipeline was successful Details

This commit is contained in:
Elara 2023-10-09 23:15:38 -07:00
parent 1133785dbd
commit 5d49de6fde
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
helper.go
View File

@ -2,9 +2,12 @@ package main
import ( import (
"os" "os"
"strings"
"github.com/urfave/cli/v2" "github.com/urfave/cli/v2"
"lure.sh/lure/internal/cpu"
"lure.sh/lure/internal/shutils/helpers" "lure.sh/lure/internal/shutils/helpers"
"lure.sh/lure/pkg/distro"
"lure.sh/lure/pkg/loggerctx" "lure.sh/lure/pkg/loggerctx"
"mvdan.cc/sh/v3/expand" "mvdan.cc/sh/v3/expand"
"mvdan.cc/sh/v3/interp" "mvdan.cc/sh/v3/interp"
@ -30,13 +33,23 @@ var helperCmd = &cli.Command{
log.Fatal("Error getting working directory").Err(err).Send() log.Fatal("Error getting working directory").Err(err).Send()
} }
info, err := distro.ParseOSRelease(ctx)
if err != nil {
log.Fatal("Error getting working directory").Err(err).Send()
}
helper, ok := helpers.Helpers[c.Args().First()] helper, ok := helpers.Helpers[c.Args().First()]
if !ok { if !ok {
log.Fatal("No such helper command").Str("handler", c.Args().First()).Send() log.Fatal("No such helper command").Str("name", c.Args().First()).Send()
} }
hc := interp.HandlerContext{ hc := interp.HandlerContext{
Env: expand.ListEnviron("pkgdir=" + c.String("dest-dir")), Env: expand.ListEnviron(
"pkgdir="+c.String("dest-dir"),
"DISTRO_ID="+info.ID,
"DISTRO_ID_LIKE="+strings.Join(info.Like, " "),
"ARCH="+cpu.Arch(),
),
Dir: wd, Dir: wd,
Stdin: os.Stdin, Stdin: os.Stdin,
Stdout: os.Stdout, Stdout: os.Stdout,