Adjust for flatpak'

diff --git a/invoke/minetest/tasks.py b/invoke/minetest/tasks.py
index 5b36db840703415d9e4d3f5a8253f0b80e4bd944..8d7937e9cb139b83e6dc3cc69085aac18df8e3e8 100644 (file)
--- a/invoke/minetest/tasks.py
+++ b/invoke/minetest/tasks.py
@@ -2,9 +2,10 @@ from invoke import task
 import os
 
 
 import os
 
 

+flat_pak_root = f"{home}/.var/app/net.minetest.Minetest"

 home = os.path.expanduser('~')
 easy_dir = f"{home}/minetest/"
 home = os.path.expanduser('~')
 easy_dir = f"{home}/minetest/"

-link_to = f"{home}/.var/app/net.minetest.Minetest/.minetest/"  # flatpak
+link_to = f"{home}/.var/app/net.minetest.Minetest/.minetest"  # flatpak

 # link_to = f"{home}/.minetest/"  # default 
 
 @task
 # link_to = f"{home}/.minetest/"  # default 
 
 @task


@@ -38,17 +39,24 @@ def restore(c, dir):
     c.run(f"mv {dir}/* {world_folder}")
     print("Finished")
 
     c.run(f"mv {dir}/* {world_folder}")
     print("Finished")
 

-@task
+# DONT - flatpak hates symlinks

 def link(c):
 def link(c):

+    # c.run(f"ls -al {link_to}")

     if os.path.isdir(link_to):
         print("Moving existing files...")
         c.run(f"mv {link_to} {easy_dir}")
     if os.path.isdir(link_to):
         print("Moving existing files...")
         c.run(f"mv {link_to} {easy_dir}")

+    if not os.path.isdir(easy_dir):
+        raise ValueError(f"{easy_dir} not found.")
+    if os.path.exists(link_to):
+        print(f"Doing nothing. {link_to} exists.")

     if os.path.isdir(easy_dir) and not os.path.exists(link_to):
         print("Linking...")
     if os.path.isdir(easy_dir) and not os.path.exists(link_to):
         print("Linking...")

-        c.run("ln -s {easy_dir} {link_to}")
+        c.run(f"ln -s {easy_dir} {link_to}")
+    # c.run(f"ls -al {link_to}")

 
 @task
 def status(c):
 
 @task
 def status(c):

-    print(f"Minetest data is at {link_to}")
-    c.run(f"ls -al {link_to}/..")
+    print(f"Minetest data assumed to be at {link_to}")
+    print(f"Easy folder assumed to be {easy_dir}")
+    c.run(f"ls -ald {link_to} | grep minetest")