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

Rename repodir to scriptdir
ci/woodpecker/push/woodpecker Pipeline was successful Details

This commit is contained in:
Elara 2022-12-01 10:53:03 -08:00
parent a106100312
commit dd33a30c35
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build.go
View File

@ -262,9 +262,9 @@ func buildPackage(ctx context.Context, script string, mgr manager.Manager) ([]st
return nil, nil, err return nil, nil, err
} }
repodir := filepath.Dir(script) scriptdir := filepath.Dir(script)
err = setDirVars(ctx, runner, srcdir, pkgdir, repodir) err = setDirVars(ctx, runner, srcdir, pkgdir, scriptdir)
if err != nil { if err != nil {
return nil, nil, err return nil, nil, err
} }
@ -527,8 +527,8 @@ func getSources(ctx context.Context, srcdir string, bv *BuildVars) error {
// setDirVars sets srcdir and pkgdir. It's a very hacky way of doing so, // setDirVars sets srcdir and pkgdir. It's a very hacky way of doing so,
// but setting the runner's Env and Vars fields doesn't seem to work. // but setting the runner's Env and Vars fields doesn't seem to work.
func setDirVars(ctx context.Context, runner *interp.Runner, srcdir, pkgdir, repodir string) error { func setDirVars(ctx context.Context, runner *interp.Runner, srcdir, pkgdir, scriptdir string) error {
cmd := "srcdir='" + srcdir + "'\npkgdir='" + pkgdir + "'\nrepodir='" + repodir + "'\n" cmd := "srcdir='" + srcdir + "'\npkgdir='" + pkgdir + "'\nscriptdir='" + scriptdir + "'\n"
fl, err := syntax.NewParser().Parse(strings.NewReader(cmd), "vars") fl, err := syntax.NewParser().Parse(strings.NewReader(cmd), "vars")
if err != nil { if err != nil {
return err return err
@ -641,4 +641,4 @@ func uniq(ss ...*[]string) {
slices.Sort(*s) slices.Sort(*s)
*s = slices.Compact(*s) *s = slices.Compact(*s)
} }
} }