From 20c313142249d1c9b2857de24bbd9ed6b115e3a1 Mon Sep 17 00:00:00 2001
From: Gioacchino Mazzurco <gio@eigenlab.org>
Date: Mon, 8 Mar 2021 20:12:50 +0100
Subject: [PATCH] Fix define_default_value in android scripts

define_default_value wrongly reported error if the variable was already
  defined, causing the scripts to fail under bash -e, fix it by
  reporting corret exit value
---
 build_scripts/Android/prepare-toolchain-clang.sh | 2 +-
 build_scripts/Android/start_gdbserver.sh         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build_scripts/Android/prepare-toolchain-clang.sh b/build_scripts/Android/prepare-toolchain-clang.sh
index 2c64a5186..83c30721b 100755
--- a/build_scripts/Android/prepare-toolchain-clang.sh
+++ b/build_scripts/Android/prepare-toolchain-clang.sh
@@ -28,7 +28,7 @@ function define_default_value()
 	VAR_NAME="${1}"
 	DEFAULT_VALUE="${2}"
 
-	[ -z "${!VAR_NAME}" ] && export ${VAR_NAME}="${DEFAULT_VALUE}"
+	[ -z "${!VAR_NAME}" ] && export ${VAR_NAME}="${DEFAULT_VALUE}" || true
 }
 
 ## You are supposed to provide the following variables according to your system setup
diff --git a/build_scripts/Android/start_gdbserver.sh b/build_scripts/Android/start_gdbserver.sh
index af25e3be1..1fd751e67 100755
--- a/build_scripts/Android/start_gdbserver.sh
+++ b/build_scripts/Android/start_gdbserver.sh
@@ -36,7 +36,7 @@ function define_default_value()
 	VAR_NAME="${1}"
 	DEFAULT_VALUE="${2}"
 
-	[ -z "${!VAR_NAME}" ] && export ${VAR_NAME}="${DEFAULT_VALUE}"
+	[ -z "${!VAR_NAME}" ] && export ${VAR_NAME}="${DEFAULT_VALUE}" || true
 }
 
 define_default_value ANDROID_APK_PACKAGE "org.retroshare.service"