From c5810ff1fcb6b974ca52c0bd6d9322db1aa59d96 Mon Sep 17 00:00:00 2001
From: Victor Martinez <VictorMartinezRubio@gmail.com>
Date: Fri, 21 Feb 2020 12:03:34 +0000
Subject: [PATCH 1/4] apm-ui: location was changed

Caused by: https://github.com/elastic/kibana/pull/57532
---
 .../scripts/clone-kibana.sh                                   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/kibana/validate-ts-interfaces-against-apm-server-sample-docs/scripts/clone-kibana.sh b/scripts/kibana/validate-ts-interfaces-against-apm-server-sample-docs/scripts/clone-kibana.sh
index ef3aac22f..0d2fc9db3 100755
--- a/scripts/kibana/validate-ts-interfaces-against-apm-server-sample-docs/scripts/clone-kibana.sh
+++ b/scripts/kibana/validate-ts-interfaces-against-apm-server-sample-docs/scripts/clone-kibana.sh
@@ -4,6 +4,6 @@ BRANCH=${2:-master}
 echo "Cloning Kibana: $OWNER:$BRANCH"
 
 cd ./tmp
-git clone --depth 1 -b $BRANCH https://github.com/$OWNER/kibana.git
-mv ./kibana/x-pack/legacy/plugins/apm/typings/es_schemas ./apm-ui-interfaces
+git clone --quiet --depth 1 -b $BRANCH https://github.com/$OWNER/kibana.git
+mv ./kibana/x-pack/plugins/apm/typings/es_schemas ./apm-ui-interfaces
 rm -rf kibana

From 2139bcf8c657d3ef3efbf758cba3073298645146 Mon Sep 17 00:00:00 2001
From: Victor Martinez <VictorMartinezRubio@gmail.com>
Date: Fri, 21 Feb 2020 12:04:10 +0000
Subject: [PATCH 2/4] lint: fix lint defects

---
 .../scripts/clone-kibana.sh                              | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/scripts/kibana/validate-ts-interfaces-against-apm-server-sample-docs/scripts/clone-kibana.sh b/scripts/kibana/validate-ts-interfaces-against-apm-server-sample-docs/scripts/clone-kibana.sh
index 0d2fc9db3..19bf062c9 100755
--- a/scripts/kibana/validate-ts-interfaces-against-apm-server-sample-docs/scripts/clone-kibana.sh
+++ b/scripts/kibana/validate-ts-interfaces-against-apm-server-sample-docs/scripts/clone-kibana.sh
@@ -1,9 +1,12 @@
+#!/usr/bin/env bash
+set -e
+
 OWNER=${1:-elastic}
 BRANCH=${2:-master}
 
-echo "Cloning Kibana: $OWNER:$BRANCH"
+echo "Cloning Kibana: ${OWNER}:${BRANCH}"
 
-cd ./tmp
-git clone --quiet --depth 1 -b $BRANCH https://github.com/$OWNER/kibana.git
+cd ./tmp || true
+git clone --quiet --depth 1 -b "${BRANCH}" "https://github.com/${OWNER}/kibana.git"
 mv ./kibana/x-pack/plugins/apm/typings/es_schemas ./apm-ui-interfaces
 rm -rf kibana

From a4d02d8bdcdcb3e526fa11778ed5545bba231bd6 Mon Sep 17 00:00:00 2001
From: Victor Martinez <VictorMartinezRubio@gmail.com>
Date: Fri, 21 Feb 2020 13:09:33 +0000
Subject: [PATCH 3/4] support backward compatibility

---
 .../scripts/clone-kibana.sh                           | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/scripts/kibana/validate-ts-interfaces-against-apm-server-sample-docs/scripts/clone-kibana.sh b/scripts/kibana/validate-ts-interfaces-against-apm-server-sample-docs/scripts/clone-kibana.sh
index 19bf062c9..a6fdcf8ec 100755
--- a/scripts/kibana/validate-ts-interfaces-against-apm-server-sample-docs/scripts/clone-kibana.sh
+++ b/scripts/kibana/validate-ts-interfaces-against-apm-server-sample-docs/scripts/clone-kibana.sh
@@ -8,5 +8,14 @@ echo "Cloning Kibana: ${OWNER}:${BRANCH}"
 
 cd ./tmp || true
 git clone --quiet --depth 1 -b "${BRANCH}" "https://github.com/${OWNER}/kibana.git"
-mv ./kibana/x-pack/plugins/apm/typings/es_schemas ./apm-ui-interfaces
+
+### In 7.7 files moved around.
+### The below section keeps backward compatibility.
+oldLocation=./kibana/x-pack/legacy/plugins/apm/typings/es_schemas
+newLocation=./kibana/x-pack/plugins/apm/typings/es_schemas
+location=${oldLocation}
+if [ -d "${newLocation}" ] ; then
+   location=${newLocation}
+fi
+mv "${location}" ./apm-ui-interfaces
 rm -rf kibana

From da4c63f6a810b9da8eaa3e66ad094521d699cb5d Mon Sep 17 00:00:00 2001
From: Victor Martinez <VictorMartinezRubio@gmail.com>
Date: Fri, 21 Feb 2020 13:13:08 +0000
Subject: [PATCH 4/4] keep it as it was

---
 .../scripts/clone-kibana.sh                                     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/kibana/validate-ts-interfaces-against-apm-server-sample-docs/scripts/clone-kibana.sh b/scripts/kibana/validate-ts-interfaces-against-apm-server-sample-docs/scripts/clone-kibana.sh
index a6fdcf8ec..ae59cc217 100755
--- a/scripts/kibana/validate-ts-interfaces-against-apm-server-sample-docs/scripts/clone-kibana.sh
+++ b/scripts/kibana/validate-ts-interfaces-against-apm-server-sample-docs/scripts/clone-kibana.sh
@@ -6,7 +6,7 @@ BRANCH=${2:-master}
 
 echo "Cloning Kibana: ${OWNER}:${BRANCH}"
 
-cd ./tmp || true
+cd ./tmp
 git clone --quiet --depth 1 -b "${BRANCH}" "https://github.com/${OWNER}/kibana.git"
 
 ### In 7.7 files moved around.