solenv/bin/assemble-flatpak.sh | 5 +++++ 1 file changed, 5 insertions(+)
New commits: commit 1b0e2cb62c80000ffad93208ea293e96954226ba Author: Stephan Bergmann <[email protected]> AuthorDate: Wed Oct 22 15:22:49 2025 +0200 Commit: Sarper Akdemir <[email protected]> CommitDate: Thu Oct 23 11:56:28 2025 +0200 Fix assemble-flatpak.sh for builds w/o --with-lang=... ...where there is no /app/libreoffice/share/registry/res/registry_*.xcd, which would have caused > mv: cannot stat '/app/libreoffice/share/registry/res/registry_*.xcd': No such file or directory to fail. (The corresponding gid_File_Registry_Lang in scp2/source/ooo/file_ooo.scp is EXTRA_ALL_LANG_BUT_EN_US, while the scp2/source/ooo/file_ooo.scp entries corresponding to the other two globs are EXTRA_ALL_LANG (gid_File_Registry_Filter_Zip) and FILE_ALL_LANG_LETTER (gid_File_Registry_Spool_Langpack_Lang), respectively; that's why only the registry_*.xcd glob could ever fail to match anything.) Change-Id: Ifc947b35ec9927306e02ec76aa1aac531bdb89b8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/192871 Reviewed-by: Stephan Bergmann <[email protected]> Tested-by: Jenkins (cherry picked from commit 3a01a57eeac6c5536c833a24bae42f6f133f603c) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/192877 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Sarper Akdemir <[email protected]> diff --git a/solenv/bin/assemble-flatpak.sh b/solenv/bin/assemble-flatpak.sh index 8d45da6cc1df..9ef9fe1b7d9d 100755 --- a/solenv/bin/assemble-flatpak.sh +++ b/solenv/bin/assemble-flatpak.sh @@ -42,6 +42,11 @@ do ln -s ../../../share/runtime/locale/"${lang}"/resource/"${i}" /app/libreoffice/program/resource done +# The .../share/registry/res/registry_*.xcd glob may match nothing (the +# .../share/registry/Langpack-*.xcd and .../share/registry/res/fcfg_langpack_*.xcd globs will always +# match at least .../share/registry/Langpack-en-US.xcd and +# .../share/registry/res/fcfg_langpack-en-US.xcd, respectively): +shopt -s nullglob for i in /app/libreoffice/share/registry/Langpack-*.xcd /app/libreoffice/share/registry/res/{fcfg_langpack,registry}_*.xcd do basename="$(basename "${i}" .xcd)"
