chiark / gitweb /
Stop the gradle version searches once one is found
authorDaniel Martí <mvdan@mvdan.cc>
Mon, 12 May 2014 13:49:23 +0000 (15:49 +0200)
committerDaniel Martí <mvdan@mvdan.cc>
Mon, 12 May 2014 13:52:02 +0000 (15:52 +0200)
buildserver/cookbooks/gradle/recipes/gradle

index 3afbc268eed5d468d831b9040ac621f815c1b34f..84ea1a5cef549454186bdcfa820ebf5613ce5993 100755 (executable)
@@ -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