commit: 3191567b7af405031ab9a2e4e5a01daad14293b2 Author: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in> AuthorDate: Fri Nov 25 11:33:26 2022 +0000 Commit: Florian Schmaus <flow <AT> gentoo <DOT> org> CommitDate: Fri Nov 25 11:37:01 2022 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=3191567b
dotnet-utils.eclass: use "edo" Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq.in> eclass/dotnet-utils.eclass | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/eclass/dotnet-utils.eclass b/eclass/dotnet-utils.eclass index ea7c6591e..17c2c685a 100644 --- a/eclass/dotnet-utils.eclass +++ b/eclass/dotnet-utils.eclass @@ -17,7 +17,7 @@ esac if [[ ! ${_DOTNET_UTILS_ECLASS} ]]; then _DOTNET_UTILS_ECLASS=1 -inherit multiprocessing +inherit edo multiprocessing # @ECLASS_VARIABLE: DOTNET_SLOT # @REQUIRED @@ -129,25 +129,18 @@ dotnet-utils_pkg_setup() { } # @FUNCTION: edotnet -# @USAGE: [[command] <args> ...] +# @USAGE: <command> [args...] # @DESCRIPTION: # Call dotnet, passing the supplied arguments. -# @RETURN: dotnet exit code edotnet() { - debug-print-function ${FUNCNAME} "$@" - - local ret - - set -- "$DOTNET_EXECUTABLE" "${@}" --runtime "${DOTNET_RUNTIME}" -maxcpucount:$(makeopts_jobs) - echo "${@}" >&2 - "${@}" - ret=${?} + debug-print-function ${FUNCNAME} "${@}" - if [[ ${ret} -ne 0 ]]; then - die -n "edotnet failed" - fi + local dotnet_args=( + --runtime "${DOTNET_RUNTIME}" + -maxcpucount:$(makeopts_jobs) + ) - return ${ret} + edo "${DOTNET_EXECUTABLE}" "${@}" "${dotnet_args[@]}" } # @FUNCTION: dotnet-utils_src_unpack