From 855af1b675b1b3c9364a0dd9b70258a1cc165d1d Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Mon, 31 Jul 2017 11:29:05 +0200 Subject: [PATCH] Removed redownload flag --- common/src/main/bash/pipeline-cf.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/common/src/main/bash/pipeline-cf.sh b/common/src/main/bash/pipeline-cf.sh index de77aef9..7f2ec4aa 100644 --- a/common/src/main/bash/pipeline-cf.sh +++ b/common/src/main/bash/pipeline-cf.sh @@ -2,7 +2,6 @@ set -e function logInToPaas() { - local redownloadInfra="${REDOWNLOAD_INFRA}" local user="PAAS_${ENVIRONMENT}_USERNAME" local cfUsername="${!user}" local pass="PAAS_${ENVIRONMENT}_PASSWORD" @@ -16,12 +15,12 @@ function logInToPaas() { CF_INSTALLED="$( cf --version || echo "false" )" CF_DOWNLOADED="$( test -r cf && echo "true" || echo "false" )" echo "CF Installed? [${CF_INSTALLED}], CF Downloaded? [${CF_DOWNLOADED}]" - if [[ ${CF_INSTALLED} == "false" && (${CF_DOWNLOADED} == "false" || ${CF_DOWNLOADED} == "true" && ${redownloadInfra} == "true") ]]; then + if [[ ${CF_INSTALLED} == "false" && ${CF_DOWNLOADED} == "false" ]]; then echo "Downloading Cloud Foundry" curl -L "https://cli.run.pivotal.io/stable?release=linux64-binary&source=github" --fail | tar -zx CF_DOWNLOADED="true" else - echo "CF is already installed or was already downloaded but the flag to redownload was disabled" + echo "CF is already installed" fi if [[ ${CF_DOWNLOADED} == "true" ]]; then