646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
26 lines
734 B
Diff
26 lines
734 B
Diff
diff --git a/shells/bash.go b/shells/bash.go
|
|
index 18d608445..f158ffc0b 100644
|
|
--- a/shells/bash.go
|
|
+++ b/shells/bash.go
|
|
@@ -3,6 +3,7 @@ package shells
|
|
import (
|
|
"bytes"
|
|
"fmt"
|
|
+ "os/exec"
|
|
"path"
|
|
"runtime"
|
|
"strconv"
|
|
@@ -307,7 +308,11 @@ func (b *BashShell) GetConfiguration(info common.ShellScriptInfo) (*common.Shell
|
|
|
|
script.Command = "su"
|
|
if runtime.GOOS == OSLinux {
|
|
- script.Arguments = []string{"-s", "/bin/" + b.Shell, info.User, "-c", script.CmdLine}
|
|
+ shellPath, err := exec.LookPath(b.Shell)
|
|
+ if err != nil {
|
|
+ shellPath = "/bin/" + b.Shell
|
|
+ }
|
|
+ script.Arguments = []string{"-s", shellPath, info.User, "-c", script.CmdLine}
|
|
} else {
|
|
script.Arguments = []string{info.User, "-c", script.CmdLine}
|
|
}
|