summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lib/buildsystem.sh17
-rw-r--r--locale/en_US/opkhelper.sh1
2 files changed, 9 insertions, 9 deletions
diff --git a/lib/buildsystem.sh b/lib/buildsystem.sh
index 11d581b..5c9579a 100644
--- a/lib/buildsystem.sh
+++ b/lib/buildsystem.sh
@@ -81,7 +81,7 @@ oh_set_buildsystem_option()
oh_buildsystem_do()
{
- _oh_local _ohbsd_step _ohbsd_bs _ohbsd_done
+ _oh_local _ohbsd_step _ohbsd_bs
if [ ${#} -ge 1 ]; then
_ohbsd_step="${1}"
@@ -91,26 +91,25 @@ oh_buildsystem_do()
return ${?}
fi
- _ohbsd_done='false'
-
if [ -n "${_OH_BUILDSYSTEM_SYSTEM}" ]; then
if "_oh_${_OH_BUILDSYSTEM_SYSTEM}_can_${_ohbsd_step}"; then
"_oh_${_OH_BUILDSYSTEM_SYSTEM}_${_ohbsd_step}" "${@}"
- _ohbsd_done='true'
+ _oh_return ${?}
+ return ${?}
fi
else
for _ohbsd_bs in ${_OH_BUILDSYSTEMS}; do
if "_oh_${_ohbsd_bs}_can_${_ohbsd_step}"; then
"_oh_${_ohbsd_bs}_${_ohbsd_step}" "${@}"
- _ohbsd_done='true'
- break
+ _oh_return ${?}
+ return ${?}
fi
done
fi
- if ! ${_ohbsd_done}; then
- : error
- fi
+ ob_warn "$(ob_get_msg 'no_capable_build_sys')"
+ _oh_return 1
+ return ${?}
}
oh_buildsystem_arch()
diff --git a/locale/en_US/opkhelper.sh b/locale/en_US/opkhelper.sh
index ca7df0a..9007eca 100644
--- a/locale/en_US/opkhelper.sh
+++ b/locale/en_US/opkhelper.sh
@@ -28,3 +28,4 @@ msg_opkhelper_chmod_lib='Setting mode of library files...'
msg_opkhelper_chmod_include='Setting mode of header files...'
msg_opkhelper_chmod_man='Setting mode of manual files...'
msg_opkhelper_chmod_bin='Setting mode of program files in "%s"...'
+msg_opkhelper_no_capable_build_sys='No capable build system found'