From 60975bf76e20c88a20b3a9dead3efeb7358114d0 Mon Sep 17 00:00:00 2001
From: Jeff Mitchell <jeffrey.mitchell@gmail.com>
Date: Sun, 15 May 2016 15:22:21 -0400
Subject: [PATCH] Revert "Remove a few assumptions regarding bash(1) being
 located in /bin."

---
 GNUmakefile => Makefile   | 0
 vault/testing.go          | 2 +-
 website/packer.json       | 2 +-
 website/scripts/deploy.sh | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename GNUmakefile => Makefile (100%)

diff --git a/GNUmakefile b/Makefile
similarity index 100%
rename from GNUmakefile
rename to Makefile
diff --git a/vault/testing.go b/vault/testing.go
index 049553b79..1f1647709 100644
--- a/vault/testing.go
+++ b/vault/testing.go
@@ -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/sh", "-c", command)
+	cmd := exec.Command("/bin/bash", []string{"-c", command}...)
 	req.Reply(true, nil)
 
 	cmd.Stdout = ch
diff --git a/website/packer.json b/website/packer.json
index 791ef5810..5732112c3 100644
--- a/website/packer.json
+++ b/website/packer.json
@@ -36,7 +36,7 @@
         "bundle check || bundle install --jobs 7",
         "bundle exec middleman build",
 
-        "/usr/bin/env bash ./scripts/deploy.sh"
+        "/bin/bash ./scripts/deploy.sh"
       ]
     }
   ]
diff --git a/website/scripts/deploy.sh b/website/scripts/deploy.sh
index f79335953..297c12fe4 100755
--- a/website/scripts/deploy.sh
+++ b/website/scripts/deploy.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 set -e
 
 PROJECT="vault"