From: Uwe Hermann <redacted>
Date: Tue, 28 Jul 2015 17:48:33 +0000 (+0200)
Subject: sigrok-cross-android: Allow non-interactive "prepare".
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=24cee2fce00a5b58331fec719ea31b1f6600c94d;p=sigrok-util.git

sigrok-cross-android: Allow non-interactive "prepare".

When running "./sigrok-cross-android prepare" the installer will
ask for confirmation at the start, and for accepting license(s)
multiple times.

Allow non-interactive or scripted use by automating / forcing these
operations.
---

diff --git a/cross-compile/android/sigrok-cross-android b/cross-compile/android/sigrok-cross-android
index b9c4e2c..b8a17fa 100755
--- a/cross-compile/android/sigrok-cross-android
+++ b/cross-compile/android/sigrok-cross-android
@@ -103,7 +103,7 @@ if [ "x$1" = "xprepare" ]; then
   # NDK
   $WGET http://dl.google.com/android/ndk/android-ndk-r$VER_NDK-linux-x86.bin
   chmod 700 android-ndk-r$VER_NDK-linux-x86.bin
-  ./android-ndk-r$VER_NDK-linux-x86.bin
+  ./android-ndk-r$VER_NDK-linux-x86.bin -y
   cd android-ndk-r$VER_NDK
   ./build/tools/make-standalone-toolchain.sh --platform=android-$VER_AND_API \
     --toolchain=arm-linux-androideabi-4.9 \
@@ -120,7 +120,7 @@ if [ "x$1" = "xprepare" ]; then
   $WGET http://dl.google.com/android/android-sdk_r$VER_SDK-linux.tgz
   tar xfz android-sdk_r$VER_SDK-linux.tgz
   cd android-sdk-linux
-  ./tools/android update sdk --no-ui --filter platform-tools,build-tools-$VER_AND_BT,android-$VER_AND_API
+  echo y | ./tools/android update sdk --no-ui --filter platform-tools,build-tools-$VER_AND_BT,android-$VER_AND_API
   cd ..
 
   exit