From 05b3d948c2ec864a314ec771465a161f6311dc44 Mon Sep 17 00:00:00 2001 From: Paul Pan Date: Wed, 13 Mar 2024 22:38:52 +0800 Subject: [PATCH] fix: use absolute path to sh --- internal/service/runner/compile.go | 2 +- internal/service/runner/new_problem.go | 2 +- internal/service/runner/run_judge.go | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/service/runner/compile.go b/internal/service/runner/compile.go index 003fb99..cc97e60 100644 --- a/internal/service/runner/compile.go +++ b/internal/service/runner/compile.go @@ -48,7 +48,7 @@ func (s *service) Compile(meta *JudgeMeta) (*JudgeStatus, e.Status) { args := &RunArgs{ 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)}, }, Runtime: RuntimeArgs{ diff --git a/internal/service/runner/new_problem.go b/internal/service/runner/new_problem.go index f202e07..ed3d833 100644 --- a/internal/service/runner/new_problem.go +++ b/internal/service/runner/new_problem.go @@ -54,7 +54,7 @@ func (s *service) PrebuildProblem(meta *JudgeMeta, config *Config, force bool) e args := &RunArgs{ 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{ Rootfs: RootfsFullDir, diff --git a/internal/service/runner/run_judge.go b/internal/service/runner/run_judge.go index 3d60e01..883c77d 100644 --- a/internal/service/runner/run_judge.go +++ b/internal/service/runner/run_judge.go @@ -76,7 +76,7 @@ func (s *service) ProblemRun(meta *JudgeMeta) ProblemRunResults { args := &RunArgs{ Program: ProgramArgs{ Args: []string{ - "sh", "-c", + "/bin/sh", "-c", "cd /woj/user && /woj/framework/scripts/woj_launcher " + s.SandboxArgsBuilder(meta, id), }, @@ -175,7 +175,7 @@ func (s *service) ProblemJudge(meta *JudgeMeta) { args := &RunArgs{ Program: ProgramArgs{ Args: []string{ - "sh", "-c", + "/bin/sh", "-c", fmt.Sprintf("cd /woj/user && make -f %s judge", script), }, Env: []string{