FIX! world directory

[dotfiles.git] / invoke / luanti-remote / tasks.py

diff --git a/invoke/luanti-remote/tasks.py b/invoke/luanti-remote/tasks.py
index cf3506dd2c1a4523bbe3a471391a61afbf1752b6..cc305f39918c880154bb0340ce8f1e07d5ce0adf 100644 (file)
--- a/invoke/luanti-remote/tasks.py
+++ b/invoke/luanti-remote/tasks.py
@@ -19,6 +19,9 @@ LOCAL_BACKUPS=f'{LOCAL_HOME}/backup/luanti'
 
 LUANTI=f'{HOME}/luanti'
 MODS=f'{LUANTI}/mods'
+WORLDS=f'{LUANTI}/worlds'
+
+
 SERVE=f'screen -d -m {LUANTI}/bin/luantiserver --gameid minetest --worldname world'
 
 def browse(c, url):
@@ -42,6 +45,7 @@ def backup_mod(c, mod):
     c.run(f'{SSH} -C tar cf {tarfile} --directory {MODS} {mod}')
     c.run(f'{SCP}:{tarfile} {LOCAL_BACKUPS}/mods')
     c.run(f'ls -l {LOCAL_BACKUPS}/mods')
+    c.run(f'tar --list -f {LOCAL_BACKUPS}/mods/{mod}.tar | tail')
     c.run(f'tar --list -f {LOCAL_BACKUPS}/mods/{mod}.tar | wc')
 
 @task
@@ -62,6 +66,8 @@ def repack_mod(c, mod):
     c.run(f'tar cf {tarfile} --directory={unpacked_mods} {mod}')
     c.run(f'mkdir -p {updated_mods}')
     c.run(f'ls -l {updated_mods}')
+    c.run(f'tar --list -f {updated_mods}/{mod}.tar | tail')
+    c.run(f'tar --list -f {updated_mods}/{mod}.tar | wc')
 
 # @task(pre=[tasks.call(backup_mod, mod=mod)])
 @task
@@ -70,17 +76,17 @@ def push_updated_mod(c, mod):
     c.run(f'{SSH} -C mkdir -p {tmpdir}')
     c.run(f'scp {updated_mods}/{mod}.tar {USER_AT_IP}:{tmpdir}')
     c.run(f'{SSH} -C ls -al {tmpdir}')
-    c.run(f'{SSH} -C tar xf {tmpdir}/{mod}.tar')
-    c.run(f'{SSH} -C ls -al {tmpdir}/root/luanti/mods')
-    c.run(f'{SSH} -C cp -r {tmpdir}/root/luanti/mods/{mod} {mods}')
-    c.run(f'{SSH} -C ls -al {mods}')
+    c.run(f'{SSH} -C tar --list -f {tmpdir}/{mod}.tar')
+    c.run(f'{SSH} -C mv {MODS}/{mod} /tmp/{mod}.{TODAY}.bk')
+    c.run(f'{SSH} -C tar xf {tmpdir}/{mod}.tar --directory {MODS}')
+    c.run(f'{SSH} -C ls -l {MODS}/{mod}')
 
 
 @task
-def compress(c):
-    c.run(f'{SSH} -C tar cf {HOME}/{BACKUP_FILE} --directory={HOME} {WORLD}')
+def compress_world(c):
+    c.run(f'{SSH} -C tar cf {HOME}/{BACKUP_FILE} --directory={WORLDS} {WORLD}')
 
-@task(compress)
+@task(compress_world)
 def backup(c):
     stopped = input("Is the server stopped?")
     if(stopped != 'y'):
@@ -90,7 +96,7 @@ def backup(c):
     c.run(f'mkdir -p {LOCAL_BACKUPS}')
     c.run(f'{SCP}:{BACKUP_FILE} {LOCAL_BACKUPS}')
     print(f'Backedup up {BACKUP_FILE} to {LOCAL_BACKUPS}')
-    c.run(f'ls {LOCAL_BACKUPS} | grep world')
+    c.run(f'ls -lh {LOCAL_BACKUPS} | grep {WORLD}')
     c.run(f'tar tvf {LOCAL_BACKUPS}/{BACKUP_FILE}')