From 52cfabcd567a3b15c8217edce752f3a3c59ca5ce Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 13 Jul 2015 13:19:20 -0400 Subject: wire tasty's option parser into the main program option parser This makes bash completion work for git-annex test, and is generally cleaner. --- git-annex.hs | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'git-annex.hs') diff --git a/git-annex.hs b/git-annex.hs index 17ce807af..ca8eecd2a 100644 --- a/git-annex.hs +++ b/git-annex.hs @@ -13,9 +13,7 @@ import Network.Socket (withSocketsDo) import qualified CmdLine.GitAnnex import qualified CmdLine.GitAnnexShell -#ifdef WITH_TESTSUITE import qualified Test -#endif #ifdef mingw32_HOST_OS import Utility.UserInfo @@ -37,14 +35,7 @@ main = withSocketsDo $ do #else gitannex ps #endif - gitannex ps = -#ifdef WITH_TESTSUITE - case ps of - ("test":ps') -> Test.main ps' - _ -> CmdLine.GitAnnex.run ps -#else - CmdLine.GitAnnex.run ps -#endif + gitannex = CmdLine.GitAnnex.run Test.optParser Test.runner isshell n = takeFileName n == "git-annex-shell" #ifdef mingw32_HOST_OS -- cgit v1.2.3