Make flatpak dirs configurable, use _

3 files changed, 7 insertions, 5 deletions

diff --git a/.build.yml b/.build.yml
index 6b9c463..78316d1 100644
--- a/.build.yml
+++ b/.build.yml
@@ -41,4 +41,4 @@ tasks:
       flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
   - release: |
       cd map-linux
-      just clean_images=1 target=x86_64-unknown-linux-gnu flatpak_cargo_generator=/home/build/flatpak-builder-tools/cargo ci
+      just clean_images=1 flatpak_cargo_generator=/home/build/flatpak-builder-tools/cargo ci
diff --git a/.gitignore b/.gitignore
index 352d1ae..5a2e910 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,11 @@
 /target
-/repo
 /.cache
 *.mo
-builddir
 vendor
 _build
 _dist
+_flatpak
+_repo
 dist
 .env
 .flatpak-builder
diff --git a/justfile b/justfile
index 31e37da..1bcd0e3 100644
--- a/justfile
+++ b/justfile
@@ -5,6 +5,8 @@ app_name := "map"
 channel := "unstable"
 builddir := "_build"
 distdir := "_dist"
+flatpakdir := "_flatpak"
+repodir := "_repo"
 clean_images := ""
 
 # Derived Values ---------------------------------------------------------------
@@ -86,8 +88,8 @@ update_flatpak_dependencies:
 
 # Builds a flatpak and exports the .flatpak file
 package-flatpak: _ensure_distdir update_flatpak_dependencies
-  flatpak-builder --force-clean --user --install-deps-from=flathub --repo=repo --install builddir ./build-aux/flatpak/systems.tranquil.Map.yml
-  flatpak build-bundle repo {{distdir}}/{{filename}}.flatpak systems.tranquil.Map
+  flatpak-builder --force-clean --user --install-deps-from=flathub --repo={{repodir}} --install {{flatpakdir}} ./build-aux/flatpak/systems.tranquil.Map.yml
+  flatpak build-bundle {{repodir}} {{distdir}}/{{filename}}.flatpak systems.tranquil.Map
 
 _fetch-linuxdeploy:
   @mkdir -p .cache