cadey
/
propellor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

reorg

This commit is contained in:
Joey Hess 2014-11-11 12:33:04 -04:00
parent 347c02a38e
commit f559ccaf73
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Propellor/Keyring.hs
View File

@ -3,6 +3,9 @@ module Propellor.Keyring where
import Propellor import Propellor
import Utility.SafeCommand import Utility.SafeCommand
keyring :: FilePath
keyring = privDataDir </> "keyring.gpg"
addKey :: String -> IO () addKey :: String -> IO ()
addKey keyid = exitBool =<< allM id [ gpg, gitadd, gitconfig, gitcommit ] addKey keyid = exitBool =<< allM id [ gpg, gitadd, gitconfig, gitcommit ]
where where
@ -30,6 +33,13 @@ addKey keyid = exitBool =<< allM id [ gpg, gitadd, gitconfig, gitcommit ]
, Param "propellor addkey" , Param "propellor addkey"
] ]
gpgopts =
[ "--options"
, "/dev/null"
, "--no-default-keyring"
, "--keyring", keyring
]
{- Automatically sign the commit if there'a a keyring. -} {- Automatically sign the commit if there'a a keyring. -}
gitCommit :: [CommandParam] -> IO Bool gitCommit :: [CommandParam] -> IO Bool
gitCommit ps = do gitCommit ps = do
@ -38,9 +48,3 @@ gitCommit ps = do
[ Just (Param "commit") [ Just (Param "commit")
, if k then Just (Param "--gpg-sign") else Nothing , if k then Just (Param "--gpg-sign") else Nothing
] ++ map Just ps ] ++ map Just ps
keyring :: FilePath
keyring = privDataDir </> "keyring.gpg"
gpgopts :: [String]
gpgopts = ["--options", "/dev/null", "--no-default-keyring", "--keyring", keyring]