From 33c6e56030ff79491d394fd6a8db915fb61305dd Mon Sep 17 00:00:00 2001 From: Michael Hobbs Date: Sun, 17 Jan 2016 17:17:04 -0800 Subject: [PATCH] support bash 4.2 so we don't have to modify all plugin test envs --- plugins/docker-options/functions | 4 +++- tests/ci/parallel_runner.sh | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/plugins/docker-options/functions b/plugins/docker-options/functions index f6564915f..07ae08b64 100644 --- a/plugins/docker-options/functions +++ b/plugins/docker-options/functions @@ -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 diff --git a/tests/ci/parallel_runner.sh b/tests/ci/parallel_runner.sh index d4d2549b3..95759ffca 100755 --- a/tests/ci/parallel_runner.sh +++ b/tests/ci/parallel_runner.sh @@ -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