commit: 5ac865638df741700b623ba58e89f3dcb3be07f3
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 9 00:23:46 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Jan 15 16:55:11 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ac86563
office-ext-r1.eclass: Switch echo to einfo, add missing || die
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
eclass/office-ext-r1.eclass | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
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
