From 2ff73a9d0afcf1a612df1f1aff03ec141df55235 Mon Sep 17 00:00:00 2001 From: Nelson Osacky Date: Tue, 18 Apr 2017 08:44:55 -0700 Subject: [PATCH] Skip okbuck if we just want to kill the buck daemon. --- buckw | 13 +++++++++++-- .../uber/okbuck/core/util/wrapper/BUCKW_TEMPLATE | 11 ++++++++++- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 3 files changed, 23 insertions(+), 5 deletions(-) diff --git a/buckw b/buckw index d22ec4d8b..c6e1cdafa 100755 --- a/buckw +++ b/buckw @@ -4,7 +4,7 @@ ## ## Buck wrapper script to invoke okbuck when needed, before running buck ## -## Created by OkBuck Gradle Plugin on : Wed Mar 29 16:37:26 PDT 2017 +## Created by OkBuck Gradle Plugin on : Tue Apr 18 22:25:10 PDT 2017 ## ######################################################################### @@ -191,7 +191,16 @@ setupBuckRun ( ) { setupBuckBinary } -setupBuckRun +# Handle parameters and flags +handleParams ( ) { + # Go directly to kill. Do not run okbuck, do not collect $200. + if [[ "kill" == $1 ]]; then + SKIP_OKBUCK=true + fi + setupBuckRun +} + +handleParams "$@" # Invoke buck binary with arguments exec "$BUCK_BINARY" "$@" diff --git a/buildSrc/src/main/resources/com/uber/okbuck/core/util/wrapper/BUCKW_TEMPLATE b/buildSrc/src/main/resources/com/uber/okbuck/core/util/wrapper/BUCKW_TEMPLATE index e5fc759b5..eda54524a 100644 --- a/buildSrc/src/main/resources/com/uber/okbuck/core/util/wrapper/BUCKW_TEMPLATE +++ b/buildSrc/src/main/resources/com/uber/okbuck/core/util/wrapper/BUCKW_TEMPLATE @@ -182,7 +182,16 @@ setupBuckRun ( ) { setupBuckBinary } -setupBuckRun +# Handle parameters and flags +handleParams ( ) { + # Go directly to kill. Do not run okbuck, do not collect $200. + if [[ "kill" == $1 ]]; then + SKIP_OKBUCK=true + fi + setupBuckRun +} + +handleParams "$@" # Invoke buck binary with arguments exec "$BUCK_BINARY" "$@" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0e8331a0d..367ffa145 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Mar 31 15:13:29 PDT 2017 +#Sat Apr 15 01:58:29 PDT 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-all.zip