From 0bb913c66144597af2631a7ae8742ab498603f11 Mon Sep 17 00:00:00 2001 From: Tyler Tidman Date: Wed, 9 Mar 2016 11:03:31 -0500 Subject: [PATCH 1/2] Use more portable shebangs for bash scripts --- terraform/openstack/scripts/install.sh | 2 +- terraform/openstack/scripts/server.sh | 2 +- terraform/openstack/scripts/service.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/terraform/openstack/scripts/install.sh b/terraform/openstack/scripts/install.sh index c22420063..7ff99aa24 100644 --- a/terraform/openstack/scripts/install.sh +++ b/terraform/openstack/scripts/install.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e # Read the address to join from the file we provisioned diff --git a/terraform/openstack/scripts/server.sh b/terraform/openstack/scripts/server.sh index 779114e28..b1e74f927 100755 --- a/terraform/openstack/scripts/server.sh +++ b/terraform/openstack/scripts/server.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e # Read from the file we created diff --git a/terraform/openstack/scripts/service.sh b/terraform/openstack/scripts/service.sh index 7c186e97a..a3e818246 100755 --- a/terraform/openstack/scripts/service.sh +++ b/terraform/openstack/scripts/service.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e echo "Starting Consul..." From cefc09f9a974850de0b905d7456c0ab313f907bc Mon Sep 17 00:00:00 2001 From: Tyler Tidman Date: Fri, 11 Mar 2016 08:59:08 -0500 Subject: [PATCH 2/2] Fix shebangs in new scripts after rebasing --- terraform/aws/scripts/install.sh | 2 +- terraform/aws/scripts/ip_tables.sh | 2 +- terraform/aws/scripts/service.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/terraform/aws/scripts/install.sh b/terraform/aws/scripts/install.sh index 5fc2b417a..a6a0c54eb 100644 --- a/terraform/aws/scripts/install.sh +++ b/terraform/aws/scripts/install.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e echo "Installing dependencies..." diff --git a/terraform/aws/scripts/ip_tables.sh b/terraform/aws/scripts/ip_tables.sh index d2fc87cf8..b304cd1a8 100644 --- a/terraform/aws/scripts/ip_tables.sh +++ b/terraform/aws/scripts/ip_tables.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e sudo iptables -I INPUT -s 0/0 -p tcp --dport 8300 -j ACCEPT diff --git a/terraform/aws/scripts/service.sh b/terraform/aws/scripts/service.sh index be67ed090..fd8b6361f 100755 --- a/terraform/aws/scripts/service.sh +++ b/terraform/aws/scripts/service.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e echo "Starting Consul..."