[Libreoffice-commits] dev-tools.git: flatpak/build.sh

[Stephan Bergmann]

 flatpak/build.sh |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

New commits:
commit af2a45c9cc2f64544d926cb94f064ee463f9674a
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Oct 31 16:07:26 2016 +0100

    Fix commenting on what is done step-by-step

diff --git a/flatpak/build.sh b/flatpak/build.sh
index c1cd891..2b82313 100755
--- a/flatpak/build.sh
+++ b/flatpak/build.sh
@@ -130,6 +130,12 @@ for i in "${my_dir?}"/inst/share/icons/hicolor/*/apps/libreoffice-*; do
  cp -a "$i" \
   "$(dirname "${my_dir?}"/app/files/share/icons/hicolor/"${i#"${my_dir?}"/inst/share/icons/hicolor/}")"/org.libreoffice.LibreOffice-"${i##*/apps/libreoffice-}"
 done
+## libreoffice-*.appdata.xml -> org.libreoffice.LibreOffice-*.appdata.xml:
+mkdir "${my_dir?}"/app/files/share/appdata
+for i in "${my_dir?}"/inst/share/appdata/libreoffice-*.appdata.xml; do
+ sed -e 's/<id>libreoffice-/<id>org.libreoffice.LibreOffice-/' "$i" \
+  > "${my_dir?}"/app/files/share/appdata/org.libreoffice.LibreOffice-"${i##*/libreoffice-}"
+done
 ## see <https://github.com/flatpak/flatpak/blob/master/app/
 ## flatpak-builtins-build-finish.c> for further places where build-finish would
 ## look for data:
@@ -139,11 +145,6 @@ done
 ## see
 ## <https://github.com/flatpak/flatpak/blob/master/builder/builder-manifest.c>
 ## for the appstream-compose command line:
-mkdir "${my_dir?}"/app/files/share/appdata
-for i in "${my_dir?}"/inst/share/appdata/libreoffice-*.appdata.xml; do
- sed -e 's/<id>libreoffice-/<id>org.libreoffice.LibreOffice-/' "$i" \
-  > "${my_dir?}"/app/files/share/appdata/org.libreoffice.LibreOffice-"${i##*/libreoffice-}"
-done
 flatpak build --nofilesystem=host "${my_dir?}"/app appstream-compose \
  --prefix=/app --origin=flatpak --basename=org.libreoffice.LibreOffice \
  org.libreoffice.LibreOffice-{base,calc,draw,impress,writer}