1 files changed, 16 insertions, 69 deletions

diff --git a/keys.hs b/keys.hs
index 00116f8..5f0da17 100644
--- a/keys.hs
+++ b/keys.hs
@@ -3,6 +3,7 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE RankNTypes #-}
 {-# LANGUAGE FlexibleInstances #-}
+{-# LANGUAGE DeriveDataTypeable #-}
 module Main where
 
 import Debug.Trace
@@ -28,9 +29,6 @@ import qualified Crypto.PubKey.RSA as RSA
 import Data.ASN1.Types
 import Data.ASN1.Encoding
 import Data.ASN1.BinaryEncoding
-import System.Console.CmdTheLine as CmdTheLine
-import System.Console.CmdTheLine.GetOpt
-import System.Console.GetOpt
 import Control.Applicative
 import System.Environment
 import System.Directory
@@ -39,6 +37,7 @@ import ControlMaybe
 import Data.Char
 import Control.Arrow (second)
 import Data.Traversable
+import System.Console.CmdArgs
 
 data RSAPublicKey = RSAKey MPI MPI
 
@@ -352,74 +351,12 @@ todo = error "unimplemented"
 lookupEnv var = 
     handleIO_ (return Nothing) $ fmap Just (getEnv var)
 
-homedir :: Term (IO String)
-homedir = envhomedir <$> opt_homedir
- where
-    envhomedir opt = do
-        gnupghome <- lookupEnv "GNUPGHOME" >>=
-                  \d -> return $ d >>= guard . (/="") >> d
-        home <- lookupEnv "HOME" >>=
-                  \d -> return $ d >>= guard . (/="") >> d
-        {-
-        home <- flip fmap getHomeDirectory $
-                  \d -> fmap (const d) $ guard (d/="")
-        -}
-        let homegnupg = (++"/.gnupg") <$> home
-        return $ maybe "" id (opt `mplus` gnupghome `mplus` homegnupg)
-
-opt_homedir = optDescrToTerm $ Option
-                    "" ["homedir"]
-                    (ReqArg id "dir")
-                    (concat
-                        [ "path to pubring.gpg"
-                        , " and secring.gpg"
-                        , " (default = ${GNUPGHOME:-$HOME/.gnupg})" ])
-
-opt_options =  optDescrToTerm $ Option
-                "" ["options"]
-                (ReqArg id "file")
-                $ concat
-                    [ "Read options from file and do not try to read"
-                    , " them from the default options file in the"
-                    , " homedir (see --homedir). This option is"
-                    , " ignored if used in an options file."
-                    , " The default options file is the first existing"
-                    , " out of keys.conf, gpg.conf-2, and gpg.conf."]
-
-opt_default_key = optDescrToTerm $ Option
-                "" ["default-key"]
-                (ReqArg id "name")
-                $ concat
-                    [ "Use name as the default key to sign with. If"
-                    , " this option is not used, the default key is"
-                    , " the first key found in the secret keyring."]
-
-opt_list_secret_keys = optDescrToTerm $ Option
-                "K" ["list-secret-keys"]
-                (NoArg ())
-                $ concat
-                    [ "List all keys from the secret keyrings." ]
-
-
 unmaybe def = fmap (maybe def id)
 
-opt_secret_keyring = expandPath <$> unmaybe "" opt_homedir <*> prim
- where
-    -- TODO: alow multiple instances of --secret-keyring
-    --       See: System.Console.CmdTheLine.Arg.vFlagAll
-    prim = unmaybe "secring.gpg" . optDescrToTerm $ Option
-                "" ["secret-keyring"]
-                (ReqArg id "file")
-                $ concat
-                    [ "Utilize secret keys in the specified file."
-                    , "(default: secring.gpg)" ]
-
 expandPath path (c:cs) | c/='/'    = path ++ "/" ++ (c:cs)
                        | otherwise = c:cs
 expandPath path []                 = []
 
-secret_packets :: Term (IO Message)
-secret_packets = readPacketsFromFile <$> opt_secret_keyring
 
 readPacketsFromFile :: FilePath -> IO Message
 readPacketsFromFile fname = do
@@ -437,6 +374,7 @@ parseOptionFile fname = do
         notComment cs      = not (all isSpace cs)
     return ys
 
+{-
 options_from_file :: 
         (forall a. [String] -> Term a -> IO (Either EvalExit a)) 
         -> Term b 
@@ -592,9 +530,18 @@ multiCommand ti choices =
     selectAction cmd choices =
         fromJust $ lookup (cmd::Command) choices
     strip (cmd,(action,_)) = fmap (cmd,) action
+-}
+
+data Keys = 
+        List
+        | AutoSign {input :: FilePath, output :: FilePath}
+  deriving (Show, Data, Typeable)
 
 main = do
-    let version = defTI { termName = "keys", CmdTheLine.version = "0.1" }
-    q <- uncurry runChoiceWithOptionsFile $ multiCommand version
-            [ cmdlist, cmdautosign ]
-    return ()
+    args <- cmdArgs $ modes [List &= help "list keys",AutoSign (def &= argPos 1
+                                                &= typFile ) 
+                                           (def &=argPos 2
+                                                &= typFile)] 
+                        &= summary "keys - a pgp key editing utility"
+    putStrLn $ show args
+