Merge pull request #1419 from hashicorp/f-path-cleanup

Remove a few assumptions regarding bash(1) being located in /bin.  Rename `Makefile` to `GNUmakefile` inline with the same change made in Consul and Nomad.
This commit is contained in:
Sean Chittenden 2016-05-15 11:52:59 -07:00
commit fe3fe64c61
4 changed files with 3 additions and 3 deletions

View File

@ -275,7 +275,7 @@ func StartSSHHostTestServer() (string, error) {
// Used to test the SSH secret backend.
func executeServerCommand(ch ssh.Channel, req *ssh.Request) {
command := string(req.Payload[4:])
cmd := exec.Command("/bin/bash", []string{"-c", command}...)
cmd := exec.Command("/bin/sh", "-c", command)
req.Reply(true, nil)
cmd.Stdout = ch

View File

@ -36,7 +36,7 @@
"bundle check || bundle install --jobs 7",
"bundle exec middleman build",
"/bin/bash ./scripts/deploy.sh"
"/usr/bin/env bash ./scripts/deploy.sh"
]
}
]

View File

@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash
set -e
PROJECT="vault"