From bde685a0467bbda98d308d2e0d722d4077f6587e Mon Sep 17 00:00:00 2001 From: Sean Chittenden Date: Mon, 1 Feb 2016 11:25:55 -0800 Subject: [PATCH] Don't assume /bin/bash is installed on all OSes Use `/usr/bin/env bash` where appropriate. --- contrib/zsh-completion/install.sh | 2 +- scripts/build.sh | 2 +- scripts/dist.sh | 2 +- scripts/verify_no_uuid.sh | 2 +- website/packer.json | 2 +- website/scripts/deploy.sh | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/contrib/zsh-completion/install.sh b/contrib/zsh-completion/install.sh index 492b58cf0..ccb36aaf7 100755 --- a/contrib/zsh-completion/install.sh +++ b/contrib/zsh-completion/install.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e ZSH_FUNC_DIR="/usr/share/zsh/site-functions" diff --git a/scripts/build.sh b/scripts/build.sh index c7bbf2acb..ef4907603 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # This script builds the application from source for multiple platforms. set -e diff --git a/scripts/dist.sh b/scripts/dist.sh index ef6c40385..a3325924a 100755 --- a/scripts/dist.sh +++ b/scripts/dist.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e # Get the version from the command line diff --git a/scripts/verify_no_uuid.sh b/scripts/verify_no_uuid.sh index 72ad7daf7..ed42ee52a 100755 --- a/scripts/verify_no_uuid.sh +++ b/scripts/verify_no_uuid.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash grep GenerateUUID consul/state/state_store.go RESULT=$? diff --git a/website/packer.json b/website/packer.json index b230c7e51..3d2ff79da 100644 --- a/website/packer.json +++ b/website/packer.json @@ -34,7 +34,7 @@ "bundle check || bundle install --jobs 7", "bundle exec middleman build", - "/bin/bash ./scripts/deploy.sh" + "/usr/bin/env bash ./scripts/deploy.sh" ] } ] diff --git a/website/scripts/deploy.sh b/website/scripts/deploy.sh index aad99fc6c..d630f1f48 100755 --- a/website/scripts/deploy.sh +++ b/website/scripts/deploy.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e PROJECT="consul"