From a309d6280604ac59fb2fbbab48bd568c4c372777 Mon Sep 17 00:00:00 2001
From: Yuan Gao <tinagao@google.com>
Date: Fri, 16 Jun 2017 18:21:45 -0700
Subject: [PATCH] ci(aio): fix test

---
 aio/scripts/payload.sh | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/aio/scripts/payload.sh b/aio/scripts/payload.sh
index 349daef3eb..c75853a947 100755
--- a/aio/scripts/payload.sh
+++ b/aio/scripts/payload.sh
@@ -41,14 +41,22 @@ timestamp=$(date +%s)
 payloadData="$payloadData\"timestamp\": $timestamp, "
 
 # Add change source: application, dependencies, or 'application+dependencies'
-allChangedFiles=$(git diff --name-only $TRAVIS_COMMIT_RANGE)
-yarnChangedFiles=$(grep yarn.lock <<< $allChangedFiles)
+yarnChanged=false
+allChangedFiles=$(git diff --name-only $TRAVIS_COMMIT_RANGE | grep -c "")
+allChangedFileNames=$(git diff --name-only $TRAVIS_COMMIT_RANGE)
 
-if [[ ! -z $allChangedFiles ]] && [[ ! -z $yarnChangedFiles ]] && [ "$allChangedFiles" != "$yarnChangedFiles" ]; then
-  change='application+dependencies'
-elif [[ ! -z $yarnChangedFiles ]]; then
+if [[ $allChangedFileNames == *"yarn.lock"* ]]; then
+  yarnChanged=true
+fi
+echo $yarnChanged
+echo $allChangedFileNames
+
+if [[ $allChangedFiles -eq 1 ]] && [[ "$yarnChanged" = true ]]; then
+  # only yarn.lock changed
   change='dependencies'
-elif [[ ! -z $allChangedFiles ]]; then
+elif [[ $allChangedFiles -gt 1 ]] && [[ "$yarnChanged" = true ]]; then
+  change='application+dependencies'
+elif [[ $allChangedFiles -gt 0 ]]; then
   change='application'
 else
   change=''