woj/woj-server
1
0
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases Wiki Activity

fix: use absolute path to sh

Browse Source
This commit is contained in:
Paul Pan 2024-03-13 22:38:52 +08:00
parent 9c764ae25e
commit 05b3d948c2
Signed by: Paul
GPG Key ID: D639BDF5BA578AF4
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/service/runner/compile.go
View File

@ -48,7 +48,7 @@ func (s *service) Compile(meta *JudgeMeta) (*JudgeStatus, e.Status) {
args := &RunArgs{ args := &RunArgs{
Program: ProgramArgs{ Program: ProgramArgs{
Args: []string{"sh", "-c", fmt.Sprintf("cd /woj/user && make -f %s compile", script)}, Args: []string{"/bin/sh", "-c", fmt.Sprintf("cd /woj/user && make -f %s compile", script)},
Env: []string{fmt.Sprintf("USER_PROG=%s", meta.Run.User), fmt.Sprintf("LANG=%s", meta.Run.Lang)}, Env: []string{fmt.Sprintf("USER_PROG=%s", meta.Run.User), fmt.Sprintf("LANG=%s", meta.Run.Lang)},
}, },
Runtime: RuntimeArgs{ Runtime: RuntimeArgs{

2
internal/service/runner/new_problem.go
View File

@ -54,7 +54,7 @@ func (s *service) PrebuildProblem(meta *JudgeMeta, config *Config, force bool) e
args := &RunArgs{ args := &RunArgs{
Program: ProgramArgs{ Program: ProgramArgs{
Args: []string{"sh", "-c", "cd /woj/problem/judge && make -f prebuild.Makefile prebuild && touch .mark.prebuild"}, Args: []string{"/bin/sh", "-c", "cd /woj/problem/judge && make -f prebuild.Makefile prebuild && touch .mark.prebuild"},
}, },
Runtime: RuntimeArgs{ Runtime: RuntimeArgs{
Rootfs: RootfsFullDir, Rootfs: RootfsFullDir,

4
internal/service/runner/run_judge.go
View File

@ -76,7 +76,7 @@ func (s *service) ProblemRun(meta *JudgeMeta) ProblemRunResults {
args := &RunArgs{ args := &RunArgs{
Program: ProgramArgs{ Program: ProgramArgs{
Args: []string{ Args: []string{
"sh", "-c", "/bin/sh", "-c",
"cd /woj/user && /woj/framework/scripts/woj_launcher " + "cd /woj/user && /woj/framework/scripts/woj_launcher " +
s.SandboxArgsBuilder(meta, id), s.SandboxArgsBuilder(meta, id),
}, },
@ -175,7 +175,7 @@ func (s *service) ProblemJudge(meta *JudgeMeta) {
args := &RunArgs{ args := &RunArgs{
Program: ProgramArgs{ Program: ProgramArgs{
Args: []string{ Args: []string{
"sh", "-c", "/bin/sh", "-c",
fmt.Sprintf("cd /woj/user && make -f %s judge", script), fmt.Sprintf("cd /woj/user && make -f %s judge", script),
}, },
Env: []string{ Env: []string{