From e09efe375e4db2f196ea7cc213aadc40d29814f4 Mon Sep 17 00:00:00 2001
From: lufebe16 <lufebe16@bluewin.ch>
Date: Thu, 27 Feb 2020 20:10:52 +0100
Subject: [PATCH] Apk build scripts - refactoring

---
 android/initsdk | 33 +++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/android/initsdk b/android/initsdk
index 7a07625d..f41acda4 100755
--- a/android/initsdk
+++ b/android/initsdk
@@ -5,22 +5,27 @@ set -eux
 
 . mkp4a.common
 
-if [[ -d $sdkdir && -d $ndkdir ]]; then
-  echo "Skipping SDK and NDK installation: SDK and NDK directories already exist."
-  exit
+urlbase=https://dl.google.com/android/repository/
+
+if [[ -d $ndkdir ]]; then
+  echo "Skipping NDK installation: NDK directory already exists."
+else
+  mkdir -p $ndkdir
+  ndk_zip=android-ndk-${ndkver}-linux-x86_64.zip
+  [ -a $ndk_zip ] || wget $urlbase/$ndk_zip
+  unzip -d $(dirname $ndkdir) $ndk_zip
 fi
 
-urlbase=https://dl.google.com/android/repository/
-tools_zip=sdk-tools-linux-4333796.zip
-ndk_zip=android-ndk-${ndkver}-linux-x86_64.zip
+if [[ -d $sdkdir  ]]; then
+  echo "Skipping SDK installation: SDK directory already exists."
+else
+  mkdir -p $sdkdir
+  tools_zip=sdk-tools-linux-4333796.zip
+  [ -a $tools_zip ] || wget $urlbase/$tools_zip
+  unzip -d $sdkdir $tools_zip
 
-mkdir -p $sdkdir $ndkdir
+  $sdkdir/tools/bin/sdkmanager 'platforms;android-27'
+  $sdkdir/tools/bin/sdkmanager 'build-tools;29.0.1'
+fi
 
-[ -a $ndk_zip ] || wget $urlbase/$ndk_zip
-unzip -d $(dirname $ndkdir) $ndk_zip
 
-[ -a $tools_zip ] || wget $urlbase/$tools_zip
-unzip -d $sdkdir $tools_zip
-
-$sdkdir/tools/bin/sdkmanager 'platforms;android-27'
-$sdkdir/tools/bin/sdkmanager 'build-tools;29.0.1'