diff options
| author | Denis Ollier <larchunix@users.noreply.github.com> | 2018-07-22 11:39:55 +0300 |
|---|---|---|
| committer | Denis Ollier <larchunix@users.noreply.github.com> | 2018-07-22 11:39:55 +0300 |
| commit | 8ada4408f1dfd322ecaf384952db5ffc2739f649 (patch) | |
| tree | 8ecddd88e405f821713eb57d023b505d77a5d26e | |
| parent | f6d3b54d01a8415154f950fb47eca77faa154929 (diff) | |
flatpak: rename DBUS_ID to REMMINA_APP_ID
| -rw-r--r-- | .gitlab-ci.yml | 1 | ||||
| -rwxr-xr-x | flatpak/flatpak-build.sh | 16 |
2 files changed, 9 insertions, 8 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f68c5e61a..c888048da 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,7 +13,6 @@ variables: DOCKER_IMAGE: "ubuntu:xenial" CMAKE_BUILD_OPTIONS: "-DCMAKE_BUILD_TYPE=Release -DWITH_APPINDICATOR=on" FLATPAK_ARCH: x86_64 - DBUS_ID: "org.remmina.Remmina" before_script: - mkdir -p .flatpak-builder/cache diff --git a/flatpak/flatpak-build.sh b/flatpak/flatpak-build.sh index ab9a1fd94..451c11a2a 100755 --- a/flatpak/flatpak-build.sh +++ b/flatpak/flatpak-build.sh @@ -1,16 +1,15 @@ #!/bin/sh -e : ${FLATPAK_ARCH:=$(flatpak --default-arch)} -FLATHUB_REPO="https://flathub.org/repo/flathub.flatpakrepo" -DBUS_ID="org.remmina.Remmina" - +FLATHUB_REPO='https://flathub.org/repo/flathub.flatpakrepo' +REMMINA_APP_ID='org.remmina.Remmina' flatpak_builder() { flatpak-builder \ --user \ --arch="${FLATPAK_ARCH}" \ - --repo=repo \ + --repo=repo/ \ --sandbox \ "$@" } @@ -21,10 +20,11 @@ cd "${FLATPAK_MANIFEST_DIR}" # Build everything but Remmina module flatpak_builder \ + --ccache \ --force-clean \ --install-deps-from=flathub \ --stop-at=remmina \ - app/ org.remmina.Remmina.json --ccache + app/ "${REMMINA_APP_ID}.json" # Build Remmina module from local checkout mkdir -p _flatpak_build @@ -45,6 +45,8 @@ flatpak_builder \ --disable-download \ --disable-updates \ --finish-only \ - app/ org.remmina.Remmina.json + app/ "${REMMINA_APP_ID}.json" -flatpak build-bundle repo remmina-dev.flatpak --runtime-repo=${FLATHUB_REPO} ${DBUS_ID} +flatpak build-bundle \ + --runtime-repo="${FLATHUB_REPO}" \ + repo/ remmina-dev.flatpak "${REMMINA_APP_ID}" |