From 95ccde94127220c6f4d350985aeca71ab89c2ec1 Mon Sep 17 00:00:00 2001
From: Andrew Cady <d@jerkface.net>
Date: Sat, 12 Oct 2019 15:26:23 -0400
Subject: Revert "Give useful error when kiki init is non-root."

This reverts commit 1da6145352f403a880890266ca79b57c992cb0dc.
---
 kiki.hs | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/kiki.hs b/kiki.hs
index 6b3d36e..5bd6951 100644
--- a/kiki.hs
+++ b/kiki.hs
@@ -43,7 +43,6 @@ import qualified Data.Map as Map
 import Control.Arrow   (first,second)
 import Data.Monoid ( (<>) )
 import Data.Binary.Put
-import System.Posix.User
 
 import CommandLine
 import Data.OpenPGP.Util (verify, fingerprint, GenerateKeyParams(..))
@@ -1312,8 +1311,6 @@ kiki "merge" [] = do
         , "                   don't write)."
         , ""
         , "  --create=(rsa:SIZE|cmd:CMD)"
-        , "                   Note: With --flow=spill, a dummy file name must still be"
-        , "                   provided so that the command line can be parsed."
         , ""
         , "  --autosign[=no]"
         , ""
@@ -1536,16 +1533,7 @@ kiki "init" args | "--help" `elem` args = do
         , ""
         ] ++ documentHomeDir ++ [""] ++ documentPassphraseFDFlag True True True
 
-kiki "init" args = do
-    rootOK <- case runArgs ([],args) dashdashChroot of
-        Left e     -> hPutStrLn stderr (usageErrorMessage e) >> return False
-        Right root -> if root "x" /= root "x"
-                        then return True
-                        else fmap (==0) $ getEffectiveUserID
-    if rootOK
-        then run args $ importAndRefresh <$> dashdashChroot <*> dashdashHomedir <*> dashdashCipher
-        else do hPutStrLn stderr "Missing --chroot option.  Permision denied."
-                exitFailure
+kiki "init" args = run args $ importAndRefresh <$> dashdashChroot <*> dashdashHomedir <*> dashdashCipher
 kiki "spawn" args | "--help" `elem` args =
     putStr . unlines $
         [ "kiki spawn [ --passphrase-fd=FD"
-- 
cgit v1.2.3