From 5ac865638df741700b623ba58e89f3dcb3be07f3 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Sat, 9 Jan 2021 01:23:46 +0100 Subject: office-ext-r1.eclass: Switch echo to einfo, add missing || die Signed-off-by: Andreas Sturmlechner --- eclass/office-ext-r1.eclass | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'eclass') diff --git a/eclass/office-ext-r1.eclass b/eclass/office-ext-r1.eclass index c0bb5c8c77d..a1649ac8d6a 100644 --- a/eclass/office-ext-r1.eclass +++ b/eclass/office-ext-r1.eclass @@ -113,12 +113,12 @@ office-ext-r1_src_unpack() { if [[ -f "${OFFICE_EXTENSIONS_LOCATION}/${i}" ]] ; then case ${i} in *.oxt) - mkdir -p "${WORKDIR}/${i}/" - pushd "${WORKDIR}/${i}/" > /dev/null - echo ">>> Unpacking "${OFFICE_EXTENSIONS_LOCATION}/${i}" to ${PWD}" + mkdir -p "${WORKDIR}/${i}/" || die + pushd "${WORKDIR}/${i}/" > /dev/null || die + einfo "Unpacking "${OFFICE_EXTENSIONS_LOCATION}/${i}" to ${PWD}" unzip -qo ${OFFICE_EXTENSIONS_LOCATION}/${i} assert "failed unpacking ${OFFICE_EXTENSIONS_LOCATION}/${i}" - popd > /dev/null + popd > /dev/null || die ;; *) unpack ${i} ;; esac @@ -138,10 +138,10 @@ office-ext-r1_src_install() { for i in ${OFFICE_IMPLEMENTATIONS[@]}; do if use office_implementation_${i}; then for j in ${OFFICE_EXTENSIONS[@]}; do - pushd "${WORKDIR}/${j}/" > /dev/null + pushd "${WORKDIR}/${j}/" > /dev/null || die insinto /usr/$(get_libdir)/${i}/share/extensions/${j/.oxt/} doins -r * - popd > /dev/null + popd > /dev/null || die done fi done -- cgit v1.2.3-18-g5258