Merge pull request #1871 from dokku/mh-support-bash-4.2

support bash 4.2 so we don't have to modify all plugin test envs
This commit is contained in:
Michael Hobbs
2016-01-17 22:01:33 -08:00
2 changed files with 4 additions and 2 deletions

View File

@@ -17,7 +17,9 @@ get_phases() {
local phase
local passed_phases
if [[ -n "$passed_phases_list" ]]; then
IFS=',' read -ra passed_phases <<< "$passed_phases_list"
OIFS=$IFS; IFS=','
read -ra passed_phases <<< "$passed_phases_list"
IFS=$OIFS
for phase in "${passed_phases[@]}"; do
[[ "$phase" = @($phases_allowed) ]] || dokku_log_fail "Phase(s) must be one of [${AVAILABLE_PHASES[*]}]"
done

View File

@@ -20,7 +20,7 @@ setup_circle() {
sudo -E make -e setup-deploy-tests
make -e ci-dependencies
# circleci runs Ubuntu 12.04 and thus a previous version of bash (4.2) than 14.04
sudo apt-get install -y -q "bash=$(apt-cache show bash | egrep "^Version: 4.3" | head -1 | awk -F: '{ print $2 }' | xargs)"
# sudo apt-get install -y -q "bash=$(apt-cache show bash | egrep "^Version: 4.3" | head -1 | awk -F: '{ print $2 }' | xargs)"
bash --version
docker version
# setup .dokkurc