Commit ffaa8c1
build: do not "exit" a script meant to be "source"d
Running exit in a script meant to be sourced means the user shell will
exit, which prevents seeing the error message, and is generally very
annoying.
Fix the "android-configure" script to use "return" instead of "exit".
PR-URL: #35520
Fixes: #35519
Reviewed-By: Michaël Zasso <targos@protonmail.com>1 parent 9156f43 commit ffaa8c1
1 file changed
Lines changed: 3 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -10,7 +10,7 @@ | |||
| 10 | 10 | ||
| 11 | 11 | if [ $# -ne 3 ]; then | |
| 12 | 12 | echo "$0 should have 3 parameters: ndk_path, target_arch and sdk_version" | |
| 13 | - exit 1 | ||
| 13 | + return 1 | ||
| 14 | 14 | fi | |
| 15 | 15 | ||
| 16 | 16 | NDK_PATH=$1 | |
@@ -44,7 +44,7 @@ case $ARCH in | |||
| 44 | 44 | ;; | |
| 45 | 45 | *) | |
| 46 | 46 | echo "Unsupported architecture provided: $ARCH" | |
| 47 | - exit 1 | ||
| 47 | + return 1 | ||
| 48 | 48 | ;; | |
| 49 | 49 | esac | |
| 50 | 50 | ||
@@ -58,7 +58,7 @@ major=$(echo $host_gcc_version | awk -F . '{print $1}') | |||
| 58 | 58 | minor=$(echo $host_gcc_version | awk -F . '{print $2}') | |
| 59 | 59 | if [ -z $major ] || [ -z $minor ] || [ $major -lt 6 ] || [ $major -eq 6 -a $minor -lt 3 ]; then | |
| 60 | 60 | echo "host gcc $host_gcc_version is too old, need gcc 6.3.0" | |
| 61 | - exit 1 | ||
| 61 | + return 1 | ||
| 62 | 62 | fi | |
| 63 | 63 | ||
| 64 | 64 | SUFFIX="$TOOLCHAIN_NAME$ANDROID_SDK_VERSION" | |
0 commit comments