slash utility (for gluing file paths).

1 files changed, 11 insertions, 4 deletions

diff --git a/kiki.hs b/kiki.hs
index 6b197c0..f239410 100644
--- a/kiki.hs
+++ b/kiki.hs
@@ -1401,7 +1401,7 @@ kiki "merge" args = do
 kiki "init" args | "--help" `elem` args = do
     putStr . unlines $
         [ "kiki init [ --passphrase-fd=FD"
-        , "          | --home[=HOMEDIR]"
+        , "          | --homedir[=HOMEDIR]"
         , "          | --chroot=ROOTDIR ] ..."
         , ""
         , "Initialize a GnuPG keyring for use with kiki.  After completion, you"
@@ -1417,6 +1417,9 @@ kiki "init" args | "--help" `elem` args = do
         , "     --chroot=ROOTDIR"
         , "                Use ROOTDIR for input of ssh keys and export files to"
         , "                ROOTDIR/var/cache/kiki instead of the current system path."
+        , "                When this option is specified, the GNUPGHOME environment"
+        , "                variable is ignored and you must use --homedir to specify"
+        , "                a value other than /root/.gnupg."
         , ""
         ] ++ documentHomeDir ++ [""] ++ documentPassphraseFDFlag True True True
 kiki "init" args = do
@@ -1426,7 +1429,7 @@ kiki "init" args = do
     -}
     let as = lefts $ map splitArg args
         lefts = mapMaybe isLeft where { isLeft (Left x) = Just x; isLeft _ = Nothing }
-        bads = map fst as \\ ["passphrase-fd","home","chroot"]
+        bads = map fst as \\ ["passphrase-fd","homedir","chroot"]
     if not (null bads) then error ("Bad option: " ++ unwords bads) else do
     let rootdir = fmap (fromMaybe "") $ lookup "chroot" as
     let noChrootArg = rootdir == Nothing
@@ -1435,7 +1438,7 @@ kiki "init" args = do
     -- maybe id fchroot rootdir $ do
     args <- return $ map (second $ fromMaybe "") as
 
-    let homespec = mplus ( (++) <$> rootdir <*> lookup "home" args )
+    let homespec = mplus (slash <$> rootdir <*> lookup "homedir" args )
                          (fmap (++"/root/.gnupg") rootdir)
         sshkeygen size = Just $ concat [ "mkdir -p \"$(dirname $file)\" && "
                                        , "ssh-keygen -P \"\" -q -f $file -b "
@@ -1447,7 +1450,11 @@ kiki "init" args = do
         -- ssl = Just "mkdir -p \"$(dirname $file)\" && openssl genrsa -out $file 1024"
     (home,secring,pubring,mbwk) <- unconditionally $ getHomeDir homespec
     osHomeDir <- if bUnprivileged then getHomeDirectory else return "/root"
-    -- putStrLn $ "home = " ++ show (home,secring,pubring,mbwk)
+    putStrLn $ "gnupg home = " ++ show (home,secring,pubring,mbwk)
+    putStrLn $ "os    home = " ++ show osHomeDir
+    -- gnupg home = ("TESTS/tmpgh","TESTS/tmpgh/secring.gpg","TESTS/tmpgh/pubring.gpg",Nothing)
+    -- os    home = "/root"
+
 
     -- Generate secring.gpg if it does not exist...
     gotsec <- doesFileExist secring