flatpak/build.sh | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-)
New commits: commit 0816ea56cf19080a62a01de95338482b323cfa41 Author: Stephan Bergmann <[email protected]> Date: Tue May 31 15:33:13 2016 +0200 flatpak/build.sh: Allow to use another flatpak branch than default "master" diff --git a/flatpak/build.sh b/flatpak/build.sh index 4956a57..96f4578 100755 --- a/flatpak/build.sh +++ b/flatpak/build.sh @@ -7,9 +7,10 @@ # This shell script creates a LibreOffice.flatpak bundle from a given git # branch/tag. # -# It expects four command line arguments, in the following order: +# It expects five command line arguments, in the following order: # * An absolute pathname for a directory where the script does all its work. # * The requested git branch/tag (i.e., the --branch argument to "git clone"). +# * The flatpak branch name. # * The absolute pathname of the GPG home directory (i.e., the --homedir= # argument to gpg) # * The GPG key ID for signing. @@ -32,9 +33,10 @@ set -e my_dir="${1?}" -my_branch="${2?}" -my_gpghomedir="${3?}" -my_gpgkeyid="${4?}" +my_gitbranch="${2?}" +my_flatpakbranch="${3?}" +my_gpghomedir="${4?}" +my_gpgkeyid="${5?}" mkdir -p "${my_dir?}" @@ -55,9 +57,9 @@ fi if [ -e "${my_dir?}"/lo ]; then git -C "${my_dir?}"/lo fetch --tags git -C "${my_dir?}"/lo submodule foreach git fetch --tags - git -C "${my_dir?}"/lo checkout "${my_branch?}" + git -C "${my_dir?}"/lo checkout "${my_gitbranch?}" else - git clone --branch "${my_branch?}" --recursive \ + git clone --branch "${my_gitbranch?}" --recursive \ git://gerrit.libreoffice.org/core "${my_dir?}"/lo fi @@ -131,7 +133,8 @@ flatpak build-finish --command=/app/libreoffice/program/soffice \ --socket=system-bus --socket=session-bus --filesystem=host \ --env=LIBO_FLATPAK=1 "${my_dir?}"/app flatpak build-export --gpg-homedir="${my_gpghomedir?}" \ - --gpg-sign="${my_gpgkeyid?}" "${my_dir?}"/repository "${my_dir?}"/app + --gpg-sign="${my_gpgkeyid?}" "${my_dir?}"/repository "${my_dir?}"/app \ + "${my_flatpakbranch?}" flatpak build-update-repo --title='The Document Foundation LibreOffice Fresh' \ --generate-static-deltas --prune --gpg-homedir="${my_gpghomedir?}" \ --gpg-sign="${my_gpgkeyid?}" "${my_dir?}"/repository @@ -143,4 +146,5 @@ gpg2 --homedir="${my_gpghomedir?}" --output="${my_dir?}"/key --export \ flatpak build-bundle \ --repo-url=http://download.documentfoundation.org/libreoffice/flatpak/repository \ --gpg-keys="${my_dir?}"/key "${my_dir?}"/repository \ - "${my_dir?}"/LibreOffice.flatpak org.libreoffice.LibreOffice + "${my_dir?}"/LibreOffice.flatpak org.libreoffice.LibreOffice \ + "${my_flatpakbranch?}" commit 991ffbdc363f2aaea258fd69e2727dece0114f21 Author: Stephan Bergmann <[email protected]> Date: Tue May 31 15:32:19 2016 +0200 flatpak/build.sh: Don't make gpg2 ask whether to overwrite existing key file diff --git a/flatpak/build.sh b/flatpak/build.sh index 02b4707..4956a57 100755 --- a/flatpak/build.sh +++ b/flatpak/build.sh @@ -137,6 +137,7 @@ flatpak build-update-repo --title='The Document Foundation LibreOffice Fresh' \ --gpg-sign="${my_gpgkeyid?}" "${my_dir?}"/repository tar --create --file "${my_dir?}"/repository.tgz --gzip \ --directory="${my_dir?}" repository +rm -f "${my_dir?}"/key gpg2 --homedir="${my_gpghomedir?}" --output="${my_dir?}"/key --export \ "${my_gpgkeyid?}" flatpak build-bundle \ commit d8949427281ef25cf281854e7200b1b5e093728b Author: Stephan Bergmann <[email protected]> Date: Tue May 31 15:30:17 2016 +0200 flatpak/build.sh: Typos in comment ...and sort command line arguments in "canonic" form, and remember to "flatpak update" an existing installation. diff --git a/flatpak/build.sh b/flatpak/build.sh index 1ce36f4..02b4707 100755 --- a/flatpak/build.sh +++ b/flatpak/build.sh @@ -18,9 +18,11 @@ # org.gnome.Platform 3.20 runtime (and SDK) from <http://sdk.gnome.org/repo/>. # To obtain the latter, do something like: # -# $ fedpkg --user remote-add gnome-sdk http://sdk.gnome.org/repo/ -# $ fedpkg --user install gnome-sdk org.gnome.Platform 3.20 -# $ fedpkg --user install gnome-sdk org.gnome.Sdk 3.20 +# $ flatpak remote-add --user gnome-sdk http://sdk.gnome.org/repo/ +# $ flatpak install --user gnome-sdk org.gnome.Platform 3.20 +# $ flatpak install --user gnome-sdk org.gnome.Sdk 3.20 +# ... +# $ flatpak update --user # # TODO: # _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
