From 12f97ee18e0ef8fa4efbc6fa7e11a7e40324cffa Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Thu, 20 Aug 2015 22:58:45 -0400 Subject: [PATCH] Use `config:get --global`to instead of grep to check for global curl config --- plugins/build-env/pre-build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/build-env/pre-build b/plugins/build-env/pre-build index 5ddb58ced..e9453d736 100755 --- a/plugins/build-env/pre-build +++ b/plugins/build-env/pre-build @@ -6,8 +6,8 @@ APP="$1"; IMAGE="dokku/$APP"; BUILD_ENV="" [[ -f "$DOKKU_ROOT/BUILD_ENV" ]] && cat "$DOKKU_ROOT/BUILD_ENV" >> "$DOKKU_ROOT/ENV" && rm "$DOKKU_ROOT/BUILD_ENV" -! (grep -q CURL_CONNECT_TIMEOUT "$DOKKU_ROOT/ENV" > /dev/null 2>&1) && dokku config:set --global CURL_CONNECT_TIMEOUT=5 -! (grep -q CURL_TIMEOUT "$DOKKU_ROOT/ENV" > /dev/null 2>&1) && dokku config:set --global CURL_TIMEOUT=30 +dokku config:get --global CURL_CONNECT_TIMEOUT > /dev/null 2>&1 || dokku config:set --global CURL_CONNECT_TIMEOUT=5 +dokku config:get --global CURL_TIMEOUT > /dev/null 2>&1 || dokku config:set --global CURL_TIMEOUT=30 if [[ -f "$DOKKU_ROOT/ENV" ]]; then BUILD_ENV+=$'\n'