make sure that that the region doesn't get overwritten.

This commit is contained in:
Jon Higgs 2013-01-31 16:19:58 +01:00
parent 6a000c3786
commit ee2193fcbe

View File

@ -150,11 +150,6 @@ app_name=`basename $0`
#sets defaults #sets defaults
selection_method="volumeid" selection_method="volumeid"
if [ -z $EC2_REGION ];
then region="us-east-1"
else
region="$EC2_REGION"
fi
#date_binary allows a user to set the "date" binary that is installed on their system and, therefore, the options that will be given to the date binary to perform date calculations #date_binary allows a user to set the "date" binary that is installed on their system and, therefore, the options that will be given to the date binary to perform date calculations
date_binary="" date_binary=""
@ -190,6 +185,14 @@ if [[ -n $cron_primer ]]
fi fi
fi fi
if [ -z $region ]; then
if [ -z $EC2_REGION ]; then
region="us-east-1"
else
region="$EC2_REGION"
fi
fi
#calls prerequisitecheck function to ensure that all executables required for script execution are available #calls prerequisitecheck function to ensure that all executables required for script execution are available
prerequisite_check prerequisite_check