From a21f11b3a08897ab1dde0cb56375d4fb223fe780 Mon Sep 17 00:00:00 2001 From: Josh Deprez Date: Mon, 27 Feb 2023 16:53:15 +1100 Subject: [PATCH] Revert "Use sh instead of bash in RunScript" --- CHANGELOG.md | 1 - bootstrap/shell/shell.go | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b78858b91a..541d0e7323 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,7 +22,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ### Changed - Upstart is no longer supported [#1946](https://github.com/buildkite/agent/pull/1946) (@sj26) -- For increased compatibility with various container images, `sh` is used instead of `bash` [#1974](https://github.com/buildkite/agent/pull/1974) (@triarius) - `pipeline upload` internally uses a new asynchronous upload flow, reducing the number of connections held open [#1927](https://github.com/buildkite/agent/pull/1927) (@triarius) - Faster failure when trying to `pipeline upload` a malformed pipeline [#1963](https://github.com/buildkite/agent/pull/1963) (@triarius) - Better errors when config loading fails [#1937](https://github.com/buildkite/agent/pull/1937) (@moskyb) diff --git a/bootstrap/shell/shell.go b/bootstrap/shell/shell.go index fe2d894047..2b5c119084 100644 --- a/bootstrap/shell/shell.go +++ b/bootstrap/shell/shell.go @@ -376,7 +376,7 @@ func (s *Shell) RunScript(ctx context.Context, path string, extra env.Environmen args = []string{"-file", path} case !isWindows && isBash: - bashPath, err := s.AbsolutePath("sh") + bashPath, err := s.AbsolutePath("bash") if err != nil { return fmt.Errorf("Error finding bash, needed to run scripts: %v.", err) }