From 686bb50bc014751df2dd7fb9cabda92b2ea78c84 Mon Sep 17 00:00:00 2001
From: darcywong00 <darcy_wong@sil.org>
Date: Thu, 1 Feb 2018 10:35:48 +0700
Subject: [PATCH] Stop warnings being reported during CI builds

-Also updated link to logo2 and copyright date in root readme
---
 README.md                              | 4 ++--
 android/KMAPro/build.sh                | 5 +++++
 android/KMEA/build.sh                  | 5 +++++
 android/Samples/KMSample1/build.sh     | 5 +++++
 android/Samples/KMSample2/build.sh     | 5 +++++
 android/Tests/KeyboardHarness/build.sh | 5 +++++
 android/build.sh                       | 5 +++++
 7 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index a7713300af..95b45c405f 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-![Keyman](https://s.keyman.com/kmc/deploy/img/logo2.ba10b4af03869e69115ce84380e980aa.png) 
+![Keyman](https://keyman.com/cdn/dev/img/logo2.png) 
 
 Open Source
 
@@ -35,6 +35,6 @@ Each platform maintains multiple types of releases:
 
 # License
 
-Copyright (c) SIL International. All rights reserved.
+Copyright (c) 2018 SIL International. All rights reserved.
 
 Licensed under the [MIT](./windows/src/LICENSE.md) License.
\ No newline at end of file
diff --git a/android/KMAPro/build.sh b/android/KMAPro/build.sh
index 9d2fecb511..bef0108120 100755
--- a/android/KMAPro/build.sh
+++ b/android/KMAPro/build.sh
@@ -11,6 +11,11 @@ display_usage ( ) {
 
 echo Build KMAPro
 
+#
+# Prevents 'clear' on exit of mingw64 bash shell
+#
+SHLVL=0
+
 NO_DAEMON=false
 
 # Parse args
diff --git a/android/KMEA/build.sh b/android/KMEA/build.sh
index f42f1d1fee..9f811b1c86 100755
--- a/android/KMEA/build.sh
+++ b/android/KMEA/build.sh
@@ -18,6 +18,11 @@ display_usage ( ) {
 
 echo Build KMEA
 
+#
+# Prevents 'clear' on exit of mingw64 bash shell
+#
+SHLVL=0
+
 # Path definitions
 KM_ROOT="$(cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
 KMA_ROOT="$KM_ROOT/android"
diff --git a/android/Samples/KMSample1/build.sh b/android/Samples/KMSample1/build.sh
index e211524b92..f7eb1e658b 100755
--- a/android/Samples/KMSample1/build.sh
+++ b/android/Samples/KMSample1/build.sh
@@ -1,5 +1,10 @@
 #!/bin/sh
 # Build KMSample1
 
+#
+# Prevents 'clear' on exit of mingw64 bash shell
+#
+SHLVL=0
+
 echo Build KMSample1
 ./gradlew clean build
diff --git a/android/Samples/KMSample2/build.sh b/android/Samples/KMSample2/build.sh
index 017c4db005..006994776d 100755
--- a/android/Samples/KMSample2/build.sh
+++ b/android/Samples/KMSample2/build.sh
@@ -1,5 +1,10 @@
 #!/bin/sh
 # Build KMSample2
 
+#
+# Prevents 'clear' on exit of mingw64 bash shell
+#
+SHLVL=0
+
 echo Build KMSample2
 ./gradlew clean build
diff --git a/android/Tests/KeyboardHarness/build.sh b/android/Tests/KeyboardHarness/build.sh
index 2dbba42f4c..02c8d5b1dd 100644
--- a/android/Tests/KeyboardHarness/build.sh
+++ b/android/Tests/KeyboardHarness/build.sh
@@ -1,6 +1,11 @@
 #!/bin/sh
 # Build KeyboardHarness test app
 
+#
+# Prevents 'clear' on exit of mingw64 bash shell
+#
+SHLVL=0
+
 echo Build KMEA
 cd ../../KMEA
 ./build.sh
diff --git a/android/build.sh b/android/build.sh
index 45f8e508ff..e8e4afb646 100755
--- a/android/build.sh
+++ b/android/build.sh
@@ -8,6 +8,11 @@ die () {
     exit 1
 }
 
+#
+# Prevents 'clear' on exit of mingw64 bash shell
+#
+SHLVL=0
+
 echo Build KMEA and KMAPro:
 cd KMEA
 ./build.sh $@