Merge pull request #1420 from hashicorp/revert-1419-f-path-cleanup
Revert "Remove a few assumptions regarding bash(1) being located in /bin."
This commit is contained in:
commit
35ff423e09
|
@ -275,7 +275,7 @@ func StartSSHHostTestServer() (string, error) {
|
||||||
// Used to test the SSH secret backend.
|
// Used to test the SSH secret backend.
|
||||||
func executeServerCommand(ch ssh.Channel, req *ssh.Request) {
|
func executeServerCommand(ch ssh.Channel, req *ssh.Request) {
|
||||||
command := string(req.Payload[4:])
|
command := string(req.Payload[4:])
|
||||||
cmd := exec.Command("/bin/sh", "-c", command)
|
cmd := exec.Command("/bin/bash", []string{"-c", command}...)
|
||||||
req.Reply(true, nil)
|
req.Reply(true, nil)
|
||||||
|
|
||||||
cmd.Stdout = ch
|
cmd.Stdout = ch
|
||||||
|
|
|
@ -36,7 +36,7 @@
|
||||||
"bundle check || bundle install --jobs 7",
|
"bundle check || bundle install --jobs 7",
|
||||||
"bundle exec middleman build",
|
"bundle exec middleman build",
|
||||||
|
|
||||||
"/usr/bin/env bash ./scripts/deploy.sh"
|
"/bin/bash ./scripts/deploy.sh"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#!/usr/bin/env bash
|
#!/bin/bash
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
PROJECT="vault"
|
PROJECT="vault"
|
||||||
|
|
Loading…
Reference in a new issue