From fa7b9690ec113457374fde10a8c9154ef9268119 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Fri, 7 Mar 2014 15:37:14 +0100 Subject: [PATCH] Clean up the gradle script a bit --- buildserver/cookbooks/gradle/recipes/gradle | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/buildserver/cookbooks/gradle/recipes/gradle b/buildserver/cookbooks/gradle/recipes/gradle index 71cf7bff..072aa407 100755 --- a/buildserver/cookbooks/gradle/recipes/gradle +++ b/buildserver/cookbooks/gradle/recipes/gradle @@ -25,9 +25,7 @@ d_plugin_k=( 0.9 0.8 0.7 0.6 0.5 0.4 0.3 0.2) d_plugin_v=(1.11 1.10 1.9 1.8 1.6 1.6 1.4 1.4) # Latest takes priority -files=(../build.gradle build.gradle) - -for f in ${files[@]}; do +for f in ../build.gradle build.gradle; do [[ -f $f ]] || continue while read l; do if [[ $l == *'com.android.tools.build:gradle:'* ]]; then @@ -61,8 +59,9 @@ if [[ -n $plugin_pver ]]; then fi fi -[[ -n $v_found ]] && run_gradle +if [[ -z $v_found ]]; then + echo "No suitable gradle version found - defaulting to $v_def" + v_found=$v_def +fi -echo "No suitable gradle version found - defaulting to $v_def" -v_found=$v_def run_gradle