From 6cd21c108c2fecd04803bd2141b9fd154fddb99b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Daniel=20Mart=C3=AD?= Date: Mon, 12 May 2014 15:49:23 +0200 Subject: [PATCH] Stop the gradle version searches once one is found --- buildserver/cookbooks/gradle/recipes/gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildserver/cookbooks/gradle/recipes/gradle b/buildserver/cookbooks/gradle/recipes/gradle index 3afbc268..84ea1a5c 100755 --- a/buildserver/cookbooks/gradle/recipes/gradle +++ b/buildserver/cookbooks/gradle/recipes/gradle @@ -39,9 +39,9 @@ done for f in ../build.gradle build.gradle; do [[ -f $f ]] || continue while read l; do - if [[ $l == *'com.android.tools.build:gradle:'* ]]; then + if [[ -z "$plugin_pver" && $l == *'com.android.tools.build:gradle:'* ]]; then plugin_pver=$(echo -n "$l" | sed "s/.*com.android.tools.build:gradle:\\([0-9\\.\\+]\\+\\).*/\\1/") - elif [[ $l == *'gradleVersion'* ]]; then + elif [[ -z "$wrapper_ver" && $l == *'gradleVersion'* ]]; then wrapper_ver=$(echo -n "$l" | sed "s/.*gradleVersion[ ]*=[ ]*[\"']\\([0-9\\.]\\+\\)[\"'].*/\\1/") fi done < $f -- 2.30.2