From eca8cf94f436967d2e9ef7cff6aa736ebc1079e2 Mon Sep 17 00:00:00 2001 From: levlam Date: Sat, 13 Aug 2022 10:37:16 +0300 Subject: [PATCH] Android example: improve checks for existence of output directory. --- example/android/build-openssl.sh | 6 ++++-- example/android/fetch-sdk.sh | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/example/android/build-openssl.sh b/example/android/build-openssl.sh index 96b439ec9..25b681de6 100755 --- a/example/android/build-openssl.sh +++ b/example/android/build-openssl.sh @@ -11,13 +11,15 @@ if [ ! -d "$ANDROID_SDK_ROOT" ] ; then exit 1 fi -if [ -d "$OPENSSL_INSTALL_DIR" ] ; then - echo "Error: directory \"$OPENSSL_INSTALL_DIR\" already exists. Delete it manually to proceed." +if [ -e "$OPENSSL_INSTALL_DIR" ] ; then + echo "Error: file or directory \"$OPENSSL_INSTALL_DIR\" already exists. Delete it manually to proceed." exit 1 fi source ./check-environment.sh || exit 1 +mkdir -p $OPENSSL_INSTALL_DIR || exit 1 + ANDROID_SDK_ROOT="$(cd "$(dirname -- "$ANDROID_SDK_ROOT")" >/dev/null; pwd -P)/$(basename -- "$ANDROID_SDK_ROOT")" OPENSSL_INSTALL_DIR="$(cd "$(dirname -- "$OPENSSL_INSTALL_DIR")" >/dev/null; pwd -P)/$(basename -- "$OPENSSL_INSTALL_DIR")" diff --git a/example/android/fetch-sdk.sh b/example/android/fetch-sdk.sh index 52d806ada..ce8e34d5a 100755 --- a/example/android/fetch-sdk.sh +++ b/example/android/fetch-sdk.sh @@ -4,8 +4,8 @@ cd $(dirname $0) ANDROID_SDK_ROOT=${1:-SDK} ANDROID_NDK_VERSION=${2:-23.2.8568313} -if [ -d "$ANDROID_SDK_ROOT" ] ; then - echo "Error: directory \"$ANDROID_SDK_ROOT\" already exists. Delete it manually to proceed." +if [ -e "$ANDROID_SDK_ROOT" ] ; then + echo "Error: file or directory \"$ANDROID_SDK_ROOT\" already exists. Delete it manually to proceed." exit 1 fi