Fix building the samples on OS X Mavericks

mystal · mystal · commit a17bec07a56e · 2015-04-08T14:45:16.000-07:00
OS X Mavericks ships an outdated version of Bash which cannot run
the build scripts requiring users to install a newer version via
MacPorts or Homebrew. Update the shebang lines in the scripts to use
Bash from the user's path instead of the binary in /bin.

Change-Id: I90e4dabd0fe9b861ab0b57e22848df46c646b1c6
diff --git a/samples-android/ButtonClicker/build.sh b/samples-android/ButtonClicker/build.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 set -eua
 
 declare -r script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
diff --git a/samples-android/CollectAllTheStarsNative/build.sh b/samples-android/CollectAllTheStarsNative/build.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 set -eua
 
 declare -r script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
diff --git a/samples-android/Minimalist/build.sh b/samples-android/Minimalist/build.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 set -eua
 
 declare -r script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
diff --git a/samples-android/TbmpSkeletonNative/build.sh b/samples-android/TbmpSkeletonNative/build.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 set -eua
 
 declare -r script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
diff --git a/samples-android/Teapot/build.sh b/samples-android/Teapot/build.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 set -eua
 
 declare -r script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
diff --git a/samples-android/TrivialQuestNative/build.sh b/samples-android/TrivialQuestNative/build.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 set -eua
 
 declare -r script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
diff --git a/samples-android/build.sh b/samples-android/build.sh
@@ -1,6 +1,11 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -eua
 
+if (($BASH_VERSINFO < 4)); then
+  echo "Sorry, you need at least bash-4.0 to run this script." >&2
+  exit 1
+fi
+
 # List of targets to build. Interpreted as directories relative to
 # this script's path.
 declare targets=(           \
diff --git a/samples-android/build_sample.sh b/samples-android/build_sample.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -eua
 
 declare result=0
diff --git a/samples-android/build_template.sh b/samples-android/build_template.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 set -eua
 
 declare -r script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#!/bin/sh`
	`1`	`+#!/usr/bin/env bash`
`2`	`2`	`set -eua`
`3`	`3`
`4`	`4`	`declare -r script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#!/bin/bash`
	`1`	`+#!/usr/bin/env bash`
`2`	`2`	`set -eua`
`3`	`3`
`4`	`4`	`declare result=0`