From 6da2f53aad168149f6083449e9625da87cb04b20 Mon Sep 17 00:00:00 2001
From: ed <s@ocv.me>
Date: Fri, 21 Oct 2022 18:49:25 +0200
Subject: [PATCH] avoid macos tmpfiles-cleaner

---
 scripts/sfx.py | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/scripts/sfx.py b/scripts/sfx.py
index 3b731431..40450f0e 100644
--- a/scripts/sfx.py
+++ b/scripts/sfx.py
@@ -235,22 +235,24 @@ def unpack():
     try:
         name += str(os.geteuid())
     except:
-        pass
+        name += "0"
 
     tag = "v" + str(STAMP)
     top = tempfile.gettempdir()
     opj = os.path.join
+    ofe = os.path.exists
     final = opj(top, name)
+    san = opj(final, "copyparty/up2k.py")
     for suf in range(0, 9001):
         withpid = "{}.{}.{}".format(name, os.getpid(), suf)
         mine = opj(top, withpid)
-        if not os.path.exists(mine):
+        if not ofe(mine):
             break
 
     tar = opj(mine, "tar")
 
     try:
-        if tag in os.listdir(final):
+        if tag in os.listdir(final) and ofe(san):
             msg("found early")
             return final
     except:
@@ -283,7 +285,7 @@ def unpack():
         f.write(b"h\n")
 
     try:
-        if tag in os.listdir(final):
+        if tag in os.listdir(final) and ofe(san):
             msg("found late")
             return final
     except:
@@ -367,17 +369,12 @@ def get_payload():
 
 def utime(top):
     # avoid cleaners
-    i = 0
     files = [os.path.join(dp, p) for dp, dd, df in os.walk(top) for p in dd + df]
-    while WINDOWS or os.path.exists("/etc/systemd"):
+    while True:
         t = int(time.time())
-        if i:
-            msg("utime {}, {}".format(i, t))
-
         for f in [top] + files:
             os.utime(f, (t, t))
 
-        i += 1
         time.sleep(78123)