[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/

[Sam James]

commit:     7d9069c315688f51766ccd232f8a79a216d44cc5
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 28 22:34:31 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Feb 28 23:04:32 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d9069c3

games-strategy/0ad: update formatting for asset generation

Signed-off-by: Sam James <sam <AT> gentoo.org>

 games-strategy/0ad/0ad-0.0.24b_alpha.ebuild | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild 
b/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
index cde93c077b3..d3e3cac5127 100644
--- a/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
+++ b/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
@@ -164,6 +164,8 @@ src_compile() {
 
        # Merged from 0ad-data
        # bug #771147 (comment 3)
+       # We're building the assets from source if we're not using a release
+       # Warning: fragile
        if [[ ${PV} == 9999 || ${PV} == *_pre* ]]; then
                # source/lib/sysdep/os/linux/ldbg.cpp:debug_SetThreadName() 
tries to open /proc/self/task/${TID}/comm for writing.
                addpredict /proc/self/task
@@ -174,13 +176,16 @@ src_compile() {
                        mod_name="${archivebuild_input##*/}"
                        archivebuild_output="archives/${mod_name}"
 
-                       mkdir -p "${archivebuild_output}"
+                       mkdir -p "${archivebuild_output}" || die
 
                        einfo pyrogenesis -archivebuild="${archivebuild_input}" 
-archivebuild-output="${archivebuild_output}/${mod_name}.zip"
-                       LD_LIBRARY_PATH="binaries/system" 
binaries/system/pyrogenesis -archivebuild="${archivebuild_input}" 
-archivebuild-output="${archivebuild_output}/${mod_name}.zip" || die
+                       LD_LIBRARY_PATH="binaries/system" 
binaries/system/pyrogenesis \
+                               -archivebuild="${archivebuild_input}" \
+                               
-archivebuild-output="${archivebuild_output}/${mod_name}.zip" \
+                       || die "Failed to build assets"
 
                        if [[ -f "${archivebuild_input}/mod.json" ]]; then
-                               cp "${archivebuild_input}/mod.json" 
"${archivebuild_output}"
+                               cp "${archivebuild_input}/mod.json" 
"${archivebuild_output}" || die
                        fi
 
                        rm -r "${archivebuild_input}" || die