diff options
| -rw-r--r-- | internal/rosa/rosa.go | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/internal/rosa/rosa.go b/internal/rosa/rosa.go index 97351f10..de4229ea 100644 --- a/internal/rosa/rosa.go +++ b/internal/rosa/rosa.go @@ -197,9 +197,12 @@ func fixupEnviron(env, extras []string, paths ...string) []string { return append(extras, env...) } +// scriptName is the name of the fixed-up build script. +const scriptName = "all" + // absCureScript is the absolute pathname [Toolchain.New] places the fixed-up // build script under. -var absCureScript = AbsSystem.Append(".cure-script") +var absCureScript = AbsSystem.Append(scriptName) const ( // TExclusive denotes an exclusive [pkg.Artifact]. @@ -310,15 +313,19 @@ mkdir -vp /work/system/bin flag&THostNet != 0, flag&TExclusive != 0, fhs.AbsRoot, env, - AbsSystem.Append("bin", "sh"), - []string{"sh", absCureScript.String()}, + absCureScript, + nil, slices.Concat([]pkg.ExecPath{pkg.Path( fhs.AbsRoot, true, support..., ), pkg.Path( absCureScript, false, - pkg.NewFile(".cure-script", []byte("set -eu -o pipefail\n"+script)), + pkg.NewFile(scriptName, []byte( + "#!/system/bin/sh\n"+ + "set -eu -o pipefail\n"+ + script, + )), )}, paths)..., ) } |