Skip to content

Commit ddc336c

Browse files
committed
change default cmd from /bin/bash to /bin/sh
Signed-off-by: Patrick Zhao <zhaoyu@koderover.com>
1 parent dde458a commit ddc336c

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

pkg/microservice/jobexecutor/core/service/step/step_shell.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ func (s *ShellStep) Run(ctx context.Context) error {
8787
return fmt.Errorf("write script file error: %v", err)
8888
}
8989

90-
cmd := exec.Command("/bin/bash", filepath.Join(os.TempDir(), userScriptFile))
90+
cmd := exec.Command("/bin/sh", filepath.Join(os.TempDir(), userScriptFile))
9191
cmd.Dir = s.workspace
9292
cmd.Env = s.envs
9393

pkg/microservice/jobexecutor/core/service/step/step_tool_install.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ func (s *ToolInstallStep) runIntallationScripts(tool *step.Tool) error {
132132
return fmt.Errorf("write script file error: %v", err)
133133
}
134134

135-
cmd := exec.Command("/bin/bash", file)
135+
cmd := exec.Command("/bin/sh", file)
136136

137137
cmdOutReader, err := cmd.StdoutPipe()
138138
if err != nil {

pkg/microservice/reaper/core/service/archive/file_archive.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ func (c *WorkspaceAchiever) Achieve(target string) ([]string, error) {
244244
// The path contains shell variables, use linux's own ability to render
245245
func (c *WorkspaceAchiever) renderPathVariable(path string) (string, error) {
246246
envs := c.Envs
247-
cmd := exec.Command("/bin/bash", "-c", fmt.Sprintf("%s %s", "echo", path))
247+
cmd := exec.Command("sh", "-c", fmt.Sprintf("%s %s", "echo", path))
248248
cmd.Stderr = os.Stderr
249249
cmd.Env = envs
250250
data, err := cmd.Output()

pkg/microservice/reaper/core/service/reaper/script.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ func (r *Reaper) runIntallationScripts() error {
133133
return fmt.Errorf("write script file error: %v", err)
134134
}
135135

136-
cmd := exec.Command("/bin/bash", file)
136+
cmd := exec.Command("/bin/sh", file)
137137
cmd.Dir = r.ActiveWorkspace
138138
cmd.Stdout = os.Stdout
139139
cmd.Stderr = os.Stderr
@@ -189,7 +189,7 @@ func (r *Reaper) createReadme(file string) error {
189189
return fmt.Errorf("write script file error: %v", err)
190190
}
191191

192-
cmd := exec.Command("/bin/bash", sfile)
192+
cmd := exec.Command("/bin/sh", sfile)
193193
cmd.Dir = r.ActiveWorkspace
194194
cmd.Stdout = os.Stdout
195195
cmd.Stderr = os.Stderr
@@ -211,7 +211,7 @@ func (r *Reaper) runScripts() error {
211211
return fmt.Errorf("write script file error: %v", err)
212212
}
213213

214-
cmd := exec.Command("/bin/bash", filepath.Join(os.TempDir(), userScriptFile))
214+
cmd := exec.Command("/bin/sh", filepath.Join(os.TempDir(), userScriptFile))
215215
cmd.Dir = r.ActiveWorkspace
216216
cmd.Env = r.getUserEnvs()
217217

@@ -348,7 +348,7 @@ func (r *Reaper) RunPostScripts() error {
348348
return fmt.Errorf("write post script file error: %v", err)
349349
}
350350

351-
cmd := exec.Command("/bin/bash", filepath.Join(os.TempDir(), postScriptFile))
351+
cmd := exec.Command("/bin/sh", filepath.Join(os.TempDir(), postScriptFile))
352352
cmd.Dir = r.ActiveWorkspace
353353
cmd.Env = r.getUserEnvs()
354354

@@ -391,7 +391,7 @@ func (r *Reaper) RunPMDeployScripts() error {
391391
return fmt.Errorf("write script file error: %v", err)
392392
}
393393

394-
cmd := exec.Command("/bin/bash", filepath.Join(os.TempDir(), pmDeployScriptFile))
394+
cmd := exec.Command("/bin/sh", filepath.Join(os.TempDir(), pmDeployScriptFile))
395395
cmd.Dir = r.ActiveWorkspace
396396

397397
cmd.Env = r.getUserEnvs()

0 commit comments

Comments
 (0)