Skip to content

Commit

Permalink
fix: add /usr/sd-static/bin to PATH (#464)
Browse files Browse the repository at this point in the history
  • Loading branch information
DekusDenial authored Oct 29, 2023
1 parent 4ace3ad commit 483fb02
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions executor/executor.go
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ func doRunCommand(guid, path string, emitter screwdriver.Emitter, f *os.File, fR
// Executes teardown commands
func doRunTeardownCommand(cmd screwdriver.CommandDef, emitter screwdriver.Emitter, shellBin, exportFile, sourceDir string, stepExitCode int) (int, error) {
shargs := []string{"-e", "-c"}
cmdStr := "export PATH=${PATH}:/opt/sd:/usr/sd/bin SD_STEP_EXIT_CODE=" + strconv.Itoa(stepExitCode) + " && " +
cmdStr := "export PATH=${PATH}:/opt/sd:/usr/sd/bin:/usr/sd-static/bin SD_STEP_EXIT_CODE=" + strconv.Itoa(stepExitCode) + " && " +
"START=$(date +'%s'); while ! [ -f " + exportFile + " ] && [ $(($(date +'%s')-$START)) -lt " + strconv.Itoa(WaitTimeout) + " ]; do sleep 1; done; " +
"if [ -f " + exportFile + " ]; then set +e; . " + exportFile + "; set -e; fi; " +
cmd.Cmd
Expand Down Expand Up @@ -281,7 +281,7 @@ func Run(path string, env []string, emitter screwdriver.Emitter, build screwdriv
// Run setup commands
setupCommands := []string{
"set -e",
"export PATH=${PATH}:/opt/sd:/usr/sd/bin",
"export PATH=${PATH}:/opt/sd:/usr/sd/bin:/usr/sd-static/bin",
// trap ABRT(6) and EXIT, echo the last step ID and write ENV to /tmp/buildEnv
"finish() { " +
"EXITCODE=$?; " +
Expand Down

0 comments on commit 483fb02

Please sign in to comment.