Add flatpak support

diff --git a/files/play_mt.sh b/files/play_mt.sh
new file mode 100755 (executable)
index 0000000..c7c027b
--- /dev/null
+++ b/files/play_mt.sh
@@ -0,0 +1 @@
+flatpak run net.minetest.Minetest

diff --git a/files/serve_mt.sh b/files/serve_mt.sh
new file mode 100755 (executable)
index 0000000..0ae924d
--- /dev/null
+++ b/files/serve_mt.sh
@@ -0,0 +1,2 @@
+flatpak run net.minetest.Minetest --gameid minegame --worldlist path
+flatpak run net.minetest.Minetest --gameid Minetest Game --server --world SurfaceWorld

diff --git a/invoke/minetest/tasks.py b/invoke/minetest/tasks.py
index 05e1fca611cad47b45c041615d8ce1250dc04045..5b36db840703415d9e4d3f5a8253f0b80e4bd944 100644 (file)
--- a/invoke/minetest/tasks.py
+++ b/invoke/minetest/tasks.py
@@ -1,6 +1,12 @@
 from invoke import task
 import os
 
+
+home = os.path.expanduser('~')
+easy_dir = f"{home}/minetest/"
+link_to = f"{home}/.var/app/net.minetest.Minetest/.minetest/"  # flatpak
+# link_to = f"{home}/.minetest/"  # default 
+
 @task
 def debug(c):
     result = c.run('which minetest')
@@ -19,21 +25,30 @@ def install(c):
     print(f"MineTest installed at {result.stdout}")
     print("To run: flatpak run net.minetest.Minetest")
 
-
 @task
 def restore(c, dir):
     if not os.path.isdir(dir):
         print(f"No backups found at {dir}")
         return
     print(f"Will restore MineTest backup from {dir}")
-    home = os.path.expanduser('~')
-    if os.path.isdir(f"{home}/.minetest") and not os.path.isdir("{home}/minetest"):
-        print(f"Moving .minetest to minetest and linking.")
-        c.run("mv ~/.minetest ~/minetest")
-        c.run("ln -s ~/minetest ~/.minetest")
+
     world_folder = f"{home}/minetest/worlds"
     c.run(f"mkdir -p {world_folder}")
+    print("Restoring backed up worlds...")
     c.run(f"mv {dir}/* {world_folder}")
     print("Finished")
 
+@task
+def link(c):
+    if os.path.isdir(link_to):
+        print("Moving existing files...")
+        c.run(f"mv {link_to} {easy_dir}")
+    if os.path.isdir(easy_dir) and not os.path.exists(link_to):
+        print("Linking...")
+        c.run("ln -s {easy_dir} {link_to}")
+
+@task
+def status(c):
+    print(f"Minetest data is at {link_to}")
+    c.run(f"ls -al {link_to}/..")