From d2936d27e158b0f67076f59a2c5d57bbed2254cb Mon Sep 17 00:00:00 2001
From: jmir1 <jhmiramon@gmail.com>
Date: Sat, 22 Apr 2023 23:39:21 +0200
Subject: [PATCH] improve sdk download ouput

---
 buildscripts/include/download-deps.sh |  2 +-
 buildscripts/include/download-sdk.sh  | 11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/buildscripts/include/download-deps.sh b/buildscripts/include/download-deps.sh
index 95b95a1a8..465009a72 100755
--- a/buildscripts/include/download-deps.sh
+++ b/buildscripts/include/download-deps.sh
@@ -3,7 +3,7 @@
 . ./include/depinfo.sh
 
 [ -z "$TRAVIS" ] && TRAVIS=0
-[ -z "$WGET" ] && WGET=wget
+[ -z "$WGET" ] && WGET="wget -q"
 
 mkdir -p deps && cd deps
 
diff --git a/buildscripts/include/download-sdk.sh b/buildscripts/include/download-sdk.sh
index b9cbf3204..9be6cd3f8 100755
--- a/buildscripts/include/download-sdk.sh
+++ b/buildscripts/include/download-sdk.sh
@@ -5,7 +5,7 @@
 . ./include/path.sh # load $os var
 
 [ -z "$TRAVIS" ] && TRAVIS=0 # skip steps not required for CI?
-[ -z "$WGET" ] && WGET=wget # possibility of calling wget differently
+[ -z "$WGET" ] && WGET="wget -q" # possibility of calling wget differently
 
 if [ "$os" == "linux" ]; then
 	if [ $TRAVIS -eq 0 ]; then
@@ -49,6 +49,7 @@ mkdir -p sdk && cd sdk
 
 # Android SDK
 if [ ! -d "android-sdk-${os}" ]; then
+	echo "Downloading command line tools..."
 	$WGET "https://dl.google.com/android/repository/commandlinetools-${os}-${v_sdk}.zip"
 	mkdir "android-sdk-${os}"
 	unzip -q -d "android-sdk-${os}" "commandlinetools-${os}-${v_sdk}.zip"
@@ -59,9 +60,11 @@ sdkmanager () {
 	[ -x "$exe" ] || exe="./android-sdk-$os/cmdline-tools/bin/sdkmanager"
 	"$exe" --sdk_root="${ANDROID_HOME}" "$@"
 }
+echo "Installing Android SDK..."
 echo y | sdkmanager \
 	"platforms;android-33" "build-tools;${v_sdk_build_tools}" \
-	"extras;android;m2repository"
+	"extras;android;m2repository" \
+	 | grep -v = || true
 
 # Android NDK (either standalone or installed by SDK)
 if [ -d "android-ndk-${v_ndk}" ]; then
@@ -69,9 +72,11 @@ if [ -d "android-ndk-${v_ndk}" ]; then
 elif [ -d "android-sdk-$os/ndk/${v_ndk_n}" ]; then
 	ln -s "android-sdk-$os/ndk/${v_ndk_n}" "android-ndk-${v_ndk}"
 elif [ -z "${os_ndk}" ]; then
-	echo y | sdkmanager "ndk;${v_ndk_n}"
+	echo "Installing Android NDK..."
+	echo y | sdkmanager "ndk;${v_ndk_n}" | grep -v = || true
 	ln -s "android-sdk-$os/ndk/${v_ndk_n}" "android-ndk-${v_ndk}"
 else
+	echo "Downloading Android NDK..."
 	$WGET "http://dl.google.com/android/repository/android-ndk-${v_ndk}-${os_ndk}.zip"
 	unzip -q "android-ndk-${v_ndk}-${os_ndk}.zip"
 	rm "android-ndk-${v_ndk}-${os_ndk}.zip"