From 514b31d975b1f7494e413cb9162c1f88b4277c9b Mon Sep 17 00:00:00 2001
From: davidcanonieto <david.cano.nieto@gmail.com>
Date: Fri, 17 May 2019 16:46:29 +0100
Subject: [PATCH]  Improve Rebase branch script (#4742)

* Improve Rebase branch script

* Improve Rebase branch script

* add comment
---
 scripts/affected-folder.sh |  9 ++++++++-
 scripts/affected-libs.sh   | 10 ++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/scripts/affected-folder.sh b/scripts/affected-folder.sh
index 2c9a15b593..82973fd05d 100755
--- a/scripts/affected-folder.sh
+++ b/scripts/affected-folder.sh
@@ -2,6 +2,7 @@
 
 eval BRANCH_NAME=""
 eval DIRECTORY="tmp"
+eval HEAD_SHA_BRANCH=""
 
 show_help() {
     echo "Usage: affected-folder.sh"
@@ -38,5 +39,11 @@ then
     exit 0
 fi
 
-echo ${FOLDER_NAME}
+HEAD_SHA_BRANCH="$(git merge-base origin/$BRANCH_NAME HEAD)"
+#echo "Branch name $BRANCH_NAME HEAD sha " $HEAD_SHA_BRANCH
+
+if git diff --name-only $HEAD_SHA_BRANCH  HEAD | grep "^${FOLDER_NAME}" &> /dev/null
+then
+    echo ${FOLDER_NAME}
+fi
 
diff --git a/scripts/affected-libs.sh b/scripts/affected-libs.sh
index bb36c9d557..4f0706c7bb 100755
--- a/scripts/affected-libs.sh
+++ b/scripts/affected-libs.sh
@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
 eval BRANCH_NAME=""
+eval HEAD_SHA_BRANCH=""
 eval DIRECTORY="tmp"
 eval GNU=false
 
@@ -41,10 +42,9 @@ then
     exit 0
 fi
 
+#check if branch needs to be updated
 ./scripts/check-branch-updated.sh -b $BRANCH_NAME || exit 1;
 
-
-
 # tmp folder doesn't exist.
 if [ ! -d "$DIRECTORY" ]; then
   #find affected libs
@@ -52,6 +52,12 @@ if [ ! -d "$DIRECTORY" ]; then
   mkdir $DIRECTORY;
 fi
 
+HEAD_SHA_BRANCH="$(git merge-base origin/$BRANCH_NAME HEAD)"
+
+if [ ! -f $DIRECTORY/deps.txt ]; then
+    npm run affected:libs -- $HEAD_SHA_BRANCH "HEAD" > $DIRECTORY/deps.txt
+fi
+
 cat $DIRECTORY/deps.txt
 #echo "extensions" > deps.txt