Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-02-22 07:49:56 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix define_default_value in android scripts

Browse Source 
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
This commit is contained in:
Gioacchino Mazzurco 2021-03-08 20:12:50 +01:00
parent 51dbbfb222
commit 20c3131422
No known key found for this signature in database
GPG Key ID: A1FBCA3872E87051
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build_scripts/Android/prepare-toolchain-clang.sh
View File

@ -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

2
build_scripts/Android/start_gdbserver.sh
View File

@ -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"