From c7e7e713f79735ed292548cd95a9cbc74b8ae57e Mon Sep 17 00:00:00 2001
From: Nathan LeClaire <nathan.leclaire@gmail.com>
Date: Mon, 25 Jul 2016 11:14:57 -0700
Subject: [PATCH] Continue POSIX-ifying build scripts

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
---
 alpine/cloud/aws/approve-account.sh    |  4 ++--
 alpine/cloud/aws/bake-ami.sh           |  4 ++--
 alpine/cloud/aws/copy-amis.sh          | 18 +++++++++---------
 alpine/cloud/azure/bake-azure.sh       |  2 +-
 alpine/packages/azure/etc/init.d/azure |  2 +-
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/alpine/cloud/aws/approve-account.sh b/alpine/cloud/aws/approve-account.sh
index 24cfcf22d..f2345e4b7 100755
--- a/alpine/cloud/aws/approve-account.sh
+++ b/alpine/cloud/aws/approve-account.sh
@@ -12,8 +12,8 @@
 
 set -e
 
-source "cloud/build-common.sh"
-source "cloud/aws/common.sh"
+. "cloud/build-common.sh"
+. "cloud/aws/common.sh"
 
 USER_ID="$1"
 
diff --git a/alpine/cloud/aws/bake-ami.sh b/alpine/cloud/aws/bake-ami.sh
index 020544874..4cf540ec8 100755
--- a/alpine/cloud/aws/bake-ami.sh
+++ b/alpine/cloud/aws/bake-ami.sh
@@ -9,8 +9,8 @@ set -e
 
 PROVIDER="aws"
 
-source "./build-common.sh"
-source "${MOBY_SRC_ROOT}/cloud/aws/common.sh"
+. "./build-common.sh"
+. "${MOBY_SRC_ROOT}/cloud/aws/common.sh"
 
 # TODO(nathanleclaire): This could be calculated dynamically to avoid conflicts.
 EBS_DEVICE=/dev/xvdb
diff --git a/alpine/cloud/aws/copy-amis.sh b/alpine/cloud/aws/copy-amis.sh
index e0d7ef64b..76215022e 100755
--- a/alpine/cloud/aws/copy-amis.sh
+++ b/alpine/cloud/aws/copy-amis.sh
@@ -14,8 +14,8 @@
 
 set -e
 
-source "cloud/build-common.sh"
-source "cloud/aws/common.sh"
+. "cloud/build-common.sh"
+. "cloud/aws/common.sh"
 
 SOURCE_AMI_ID=$(cat ./cloud/aws/ami_id.out)
 
@@ -47,9 +47,12 @@ fi
 
 cfecho '"AWSRegionArch2AMI": {'
 
-REGIONS=(us-west-1 us-west-2 us-east-1 eu-west-1 eu-central-1 ap-southeast-1 ap-northeast-1 ap-southeast-2 ap-northeast-2 sa-east-1)
+REGIONS="us-west-1 us-west-2 us-east-1 eu-west-1 eu-central-1 ap-southeast-1 ap-northeast-1 ap-southeast-2 ap-northeast-2 sa-east-1"
 
-for REGION in ${REGIONS[@]}
+# (last element of array to emit no comma for JSON)
+LAST_REGION="${REGIONS##* }"
+
+for REGION in ${REGIONS}
 do
 	REGION_AMI_ID=$(aws ec2 copy-image \
 		--source-region $(current_instance_region) \
@@ -67,11 +70,8 @@ do
 		\"HVMG2\": \"NOT_SUPPORTED\"
 	}"
 
-	# Emit valid JSON.  No trailing comma on last element.
-	#
-	# TODO: I'm pretty sure this negative index is a Bash-ism, and a Bash-ism
-	# from recent versions at that.
-	if [ ${REGION} != ${REGIONS[-1]} ]
+	# TODO: Not amazing way to determine last element.
+	if [ ${REGION} != "${LAST_REGION}" ]
 	then
 		cfecho ","
 	else
diff --git a/alpine/cloud/azure/bake-azure.sh b/alpine/cloud/azure/bake-azure.sh
index 5793d6e6d..73684d95c 100755
--- a/alpine/cloud/azure/bake-azure.sh
+++ b/alpine/cloud/azure/bake-azure.sh
@@ -24,7 +24,7 @@ set -e
 
 PROVIDER="azure"
 
-source "build-common.sh"
+. "build-common.sh"
 
 case "$1" in
 	makeraw)
diff --git a/alpine/packages/azure/etc/init.d/azure b/alpine/packages/azure/etc/init.d/azure
index 3b725d61e..99200cc4d 100755
--- a/alpine/packages/azure/etc/init.d/azure
+++ b/alpine/packages/azure/etc/init.d/azure
@@ -62,7 +62,7 @@ start()
 		sleep 5
 	done
 
-	source /var/lib/waagent/CustomData
+	. /var/lib/waagent/CustomData
 
 	if [ "${ROLE}" = "MANAGER" ]
 	then