diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2021-01-09 01:23:46 +0100 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2021-01-15 17:55:11 +0100 |
| commit | 5ac865638df741700b623ba58e89f3dcb3be07f3 (patch) | |
| tree | 7bef2243a11e38d5c210abbc65ae11d7f2817784 /eclass/office-ext-r1.eclass | |
| parent | office-ext-r1.eclass: Drop openoffice support and functions (diff) | |
| download | gentoo-5ac865638df741700b623ba58e89f3dcb3be07f3.tar.gz gentoo-5ac865638df741700b623ba58e89f3dcb3be07f3.tar.bz2 gentoo-5ac865638df741700b623ba58e89f3dcb3be07f3.zip | |
office-ext-r1.eclass: Switch echo to einfo, add missing || die
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'eclass/office-ext-r1.eclass')
| -rw-r--r-- | eclass/office-ext-r1.eclass | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/eclass/office-ext-r1.eclass b/eclass/office-ext-r1.eclass index c0bb5c8c77dc..a1649ac8d6aa 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 |