[Libreoffice-commits] core.git: solenv/bin solenv/flatpak-manifest.in

[Libreoffice Gerrit user]

 solenv/bin/assemble-flatpak.sh |   13 ++++++++++++-
 solenv/flatpak-manifest.in     |    4 +---
 2 files changed, 13 insertions(+), 4 deletions(-)

New commits:
commit e31c2c03f9ff06df553e577a1d9149ce75e7ff7f
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Wed Feb 13 10:15:31 2019 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Wed Feb 13 15:13:36 2019 +0100

    Move desktop-file-edit calls to assemble-flatpak.sh
    
    (and fix one comment)
    
    Change-Id: I1e2e72427b6021194b2010535e01b9ca69e4a029
    Reviewed-on: https://gerrit.libreoffice.org/67760
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/solenv/bin/assemble-flatpak.sh b/solenv/bin/assemble-flatpak.sh
index 67ad285fcf98..6c0734178662 100755
--- a/solenv/bin/assemble-flatpak.sh
+++ b/solenv/bin/assemble-flatpak.sh
@@ -15,7 +15,7 @@ set -e
 
 cp -r "${PREFIXDIR?}"/lib/libreoffice /app/
 
-## libreoffice-*.desktop -> org.libreoffice.LibreOffice-*.desktop:
+## libreoffice-*.desktop -> org.libreoffice.LibreOffice.*.desktop:
 mkdir -p /app/share/applications
 for i in "${PREFIXDIR?}"/share/applications/libreoffice-*.desktop
 do
@@ -30,6 +30,17 @@ mv /app/share/applications/org.libreoffice.LibreOffice.startcenter.desktop \
 # the order of XDG_DATA_DIRS - re-associating text/plain seems a bit much
 sed -i "s/text\/plain;//" /app/share/applications/org.libreoffice.LibreOffice.writer.desktop
 
+desktop-file-edit --set-key=X-Endless-Alias --set-value=libreoffice-startcenter \
+ --set-key=X-Flatpak-RenamedFrom --set-value='libreoffice-startcenter.desktop;' \
+ /app/share/applications/org.libreoffice.LibreOffice.desktop
+for i in base calc draw impress math writer xsltfilter
+do
+ desktop-file-edit --set-key=X-Endless-Alias --set-value=libreoffice-"$i" \
+  --set-key=X-Flatpak-RenamedFrom \
+  --set-value="libreoffice-$i.desktop;org.libreoffice.LibreOffice-$i.desktop;" \
+  /app/share/applications/org.libreoffice.LibreOffice."$i".desktop
+done
+
 ## icons/hicolor/*/apps/libreoffice-* ->
 ## icons/hicolor/*/apps/org.libreoffice.LibreOffice-*:
 mkdir -p /app/share/icons
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 833641babbae..61140e71b31b 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -574,9 +574,7 @@
                 "./autogen.sh --prefix=/run/build/libreoffice/inst --with-distro=LibreOfficeFlatpak",
                 "make $(if test \"$FLATPAK_ARCH\" = i386; then printf build-nocheck; fi)",
                 "make distro-pack-install",
-                "make cmd cmd='$(SRCDIR)/solenv/bin/assemble-flatpak.sh'",
-                "desktop-file-edit --set-key=X-Endless-Alias --set-value=libreoffice-startcenter --set-key=X-Flatpak-RenamedFrom --set-value='libreoffice-startcenter.desktop;' /app/share/applications/org.libreoffice.LibreOffice.desktop",
-                "for i in base calc draw impress math writer xsltfilter; do desktop-file-edit --set-key=X-Endless-Alias --set-value=libreoffice-$i --set-key=X-Flatpak-RenamedFrom --set-value=\"libreoffice-$i.desktop;org.libreoffice.LibreOffice-$i.desktop;\" /app/share/applications/org.libreoffice.LibreOffice.$i.desktop; done"
+                "make cmd cmd='$(SRCDIR)/solenv/bin/assemble-flatpak.sh'"
             ]
         }
     ],