Use termux_error_exit in more cases

This commit is contained in:
Fredrik Fornwall 2017-03-05 03:30:38 +01:00
parent a0161a8d8b
commit 72f69cdc35
4 changed files with 4 additions and 9 deletions

View File

@ -63,7 +63,6 @@ termux_step_post_make_install () {
termux_step_post_massage () {
if [ ! -f libexec/git-core/git-remote-https ]; then
echo "ERROR: Built without https support"
exit 1
termux_error_exit "Git built without https support"
fi
}

View File

@ -74,8 +74,7 @@ termux_step_pre_configure () {
elif [ $TERMUX_ARCH = "x86_64" ]; then
LLVM_TARGET_ARCH=X86
else
echo "Invalid arch: $TERMUX_ARCH"
exit 1
termux_error_exit "Invalid arch: $TERMUX_ARCH"
fi
# see CMakeLists.txt and tools/clang/CMakeLists.txt
TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" -DLLVM_DEFAULT_TARGET_TRIPLE=$LLVM_DEFAULT_TARGET_TRIPLE"

View File

@ -28,9 +28,7 @@ fi
termux_step_pre_configure() {
# Validate that we have the right version:
grep -q "Version $_PICOLISP_YEAR $_PICOLISP_MONTH $_PICOLISP_DAY" src64/version.l || {
echo "ERROR: Picolisp version needs to be bumped" 1>&2
grep Version src64/version.l 1>&2
exit 1
termux_error_exit "Picolisp version needs to be bumped"
}
if [ $TERMUX_ARCH_BITS = 64 ]; then

View File

@ -77,8 +77,7 @@ termux_step_post_massage () {
# Verify that desired modules have been included:
for module in _ssl _bz2 zlib _curses _sqlite3 _lzma; do
if [ ! -f lib/python${_MAJOR_VERSION}/lib-dynload/${module}.*.so ]; then
echo "ERROR: Python module library $module not built"
exit 1
termux_error_exit "Python module library $module not built"
fi
done