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

[Stephan Bergmann]

 flatpak/build.sh |   15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

New commits:
commit ae839720577de1c717cbad20c305ba592183096d
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Sep 18 13:15:34 2017 +0200

    Reliably accept both tags and branches
    
    The original code would not have fast-forwarded branches.  The new code avoids
    that by not doing a local checkout anyway.  Additionally, --mirror ensures that
    branch names don't need to be prefixed with "origin/" in the 'git show' command.

diff --git a/flatpak/build.sh b/flatpak/build.sh
index fab02d7..3e8fffa 100755
--- a/flatpak/build.sh
+++ b/flatpak/build.sh
@@ -47,17 +47,16 @@ my_gpgkeyid="${5?}"
 
 mkdir -p "${my_dir?}"
 
-if [ -e "${my_dir?}"/lo ]; then
- git -C "${my_dir?}"/lo fetch --tags
- git -C "${my_dir?}"/lo checkout "${my_gitbranch?}"
-else
- git clone --branch "${my_gitbranch?}" git://gerrit.libreoffice.org/core \
-  "${my_dir?}"/lo
+if [ ! -e "${my_dir?}"/lo ]; then
+ git clone --mirror git://gerrit.libreoffice.org/core "${my_dir?}"/lo
 fi
 
+rm -f "${my_dir?}"/manifest.in
+git -C "${my_dir?}"/lo show "${my_gitbranch?}":solenv/flatpak-manifest.in \
+ > "${my_dir?}"/manifest.in
+
 rm -f "${my_dir?}"/manifest.json
-sed "s/@BRANCH@/${my_gitbranch?}/" \
- < "${my_dir?}"/lo/solenv/flatpak-manifest.in > "${my_dir?}"/manifest.json
+sed "s!@BRANCH@!${my_gitbranch?}!" < manifest.in > "${my_dir?}"/manifest.json
 
 flatpak-builder --default-branch="${my_flatpakbranch?}" \
  --repo="${my_dir?}"/repository --gpg-homedir="${my_gpghomedir?}" \