nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/fix-shell-path.patch
Pascal Bach 9dbb71b1d3 gitlab-runner-v1: remove v1 package (#47624)
It was required for gitlab < 9 which is not supported anymore since some time.

While removinf the V1 the patch was refreshed to cleanly work with version 11.x
2018-10-01 23:37:25 +02:00

29 lines
778 B
Diff

diff --git a/shells/bash.go b/shells/bash.go
index 673f4765..a58cc5e2 100644
--- a/shells/bash.go
+++ b/shells/bash.go
@@ -5,6 +5,7 @@ import (
"bytes"
"fmt"
"io"
+ "os/exec"
"path"
"runtime"
"strconv"
@@ -225,7 +226,11 @@ func (b *BashShell) GetConfiguration(info common.ShellScriptInfo) (script *commo
if info.User != "" {
script.Command = "su"
if runtime.GOOS == "linux" {
- script.Arguments = append(script.Arguments, "-s", "/bin/"+b.Shell)
+ shellPath, err := exec.LookPath(b.Shell)
+ if err != nil {
+ shellPath = "/bin/"+b.Shell
+ }
+ script.Arguments = append(script.Arguments, "-s", shellPath)
}
script.Arguments = append(script.Arguments, info.User)
script.Arguments = append(script.Arguments, "-c", shellCommand)
--
2.18.0