cleanup old comment, and unnecessary rm -rf

1 files changed, 1 insertions, 19 deletions

diff --git a/lib/Kiki.hs b/lib/Kiki.hs
index 34594cc..79868c9 100644
--- a/lib/Kiki.hs
+++ b/lib/Kiki.hs
@@ -219,7 +219,7 @@ refreshCache rt rootdir = do
             unslash ('/':xs) = xs
             unslash xs = xs
         createDirectoryIfMissing True cachedir
-        tmpdir <- createTempDirectory cachedir "tmp.dir"
+        tmpdir <- createTempDirectory cachedir "transaction.dir"
         createSymbolicLink tmpdir (tmpdir ++ ".link")
         let mkpath pth = tmpdir </> unslash pth
             commit     = rename (tmpdir ++ ".link") destdir
@@ -247,24 +247,6 @@ refreshCache rt rootdir = do
     -- sshspathpub0 = fromMaybe "" rootdir ++ "/etc/ssh/ssh_host_rsa_key.pub"
     -- contactipsec0 = fromMaybe "" rootdir ++ "/etc/ipsec.d/certs/%(onion).pem"
 
-    -- TODO (atomic transactions)
-    --
-    -- Use this stratagy for atomic transactions:
-    --
-    -- # cachedir=./cache                           -- let cacheddir = ".cache"
-    -- # destdir=config # relative to cachedir      --     destdir   = "config"
-    -- # mkdir -p "$cachedir"                       -- createDirectoryIfMissing True cacheddir
-    -- # cd "$cachedir"
-    -- # tempdir=$(mktemp -d --tmpdir=.) || exit 1  -- tmpdir <- createTempDirectory cachedir "tmp.dir"
-    -- # touch "$tempdir"/asdf                      --  ** Do Transaction stuff here **
-    -- # ln -s "$tempdir" "$tempdir".link           -- createSymbolicLink tmpdir (tmpdir ++ ".link")
-    -- # mv -T "$tempdir".link "$destdir"           -- rename (tmpdir ++ ".link") (cachedir </> destdir)
-    --
-    -- (before ln -s, "$tempdir" could be renamed to something meaningful)
-    --
-    -- For now, we will just rm -rf the old cache and regenerate in-place.
-    readProcessWithExitCode "rm" ["-rf", mkpath "*"] "" -- clean up, in case gpg altered the keyring.
-
     flip (maybe $ warn "missing working key?") (rtWorkingKey rt) $ \wk -> do
 
     let grip = fingerprint wk