[commit: Cabal] master: installCommand only ever needs to use defaultProgramConfiguration (fc7a5ca)

[Ian Lynagh]

Repository : ssh://darcs.haskell.org//srv/darcs/packages/Cabal

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/fc7a5ca9cec0f4ba1d0b44350469b1f8a2cbf810

>---------------------------------------------------------------

commit fc7a5ca9cec0f4ba1d0b44350469b1f8a2cbf810
Author: Duncan Coutts <duncan at haskell.org>
Date:   Mon Dec 17 18:58:11 2007 +0000

    installCommand only ever needs to use defaultProgramConfiguration
    So don't bother making it a parameter

>---------------------------------------------------------------

 cabal-install/Hackage/Setup.hs |    8 ++++----
 cabal-install/Main.hs          |    4 +---
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/cabal-install/Hackage/Setup.hs b/cabal-install/Hackage/Setup.hs
index fe99559..0ffcb27 100644
--- a/cabal-install/Hackage/Setup.hs
+++ b/cabal-install/Hackage/Setup.hs
@@ -22,7 +22,7 @@ module Hackage.Setup
     , updateConfig
     ) where
 
-import Distribution.Simple.Program (ProgramConfiguration)
+import Distribution.Simple.Program (defaultProgramConfiguration)
 import Distribution.Simple.Compiler (PackageDB(..))
 import Distribution.Simple.InstallDirs (combineInstallDirs)
 import Distribution.Simple.Command
@@ -87,11 +87,11 @@ globalCommand = Cabal.globalCommand {
       ++ "\nSee http://www.haskell.org/cabal/ for more information.\n"
   }
 
-installCommand :: ProgramConfiguration -> CommandUI Cabal.ConfigFlags
-installCommand progConf = (Cabal.configureCommand progConf) {
+installCommand :: CommandUI Cabal.ConfigFlags
+installCommand = (Cabal.configureCommand defaultProgramConfiguration) {
     commandName     = "install",
     commandSynopsis = "Installs a list of packages.",
-    commandUsage       = usagePackages "install"
+    commandUsage    = usagePackages "install"
   }
 
 fetchCommand :: CommandUI ()
diff --git a/cabal-install/Main.hs b/cabal-install/Main.hs
index 5cf187a..16a893e 100644
--- a/cabal-install/Main.hs
+++ b/cabal-install/Main.hs
@@ -17,7 +17,6 @@ import Hackage.Setup
 import Distribution.PackageDescription (cabalVersion)
 import qualified Distribution.Simple.Setup as Cabal
 import Distribution.Simple.Setup (fromFlag)
-import Distribution.Simple.Program
 import Distribution.Simple.Command
 import Distribution.Simple.UserHooks (Args)
 import Hackage.Config           (defaultConfigFile, loadConfig, findCompiler)
@@ -65,9 +64,8 @@ mainWorker args =
                                   ++ showVersion cabalVersion
                                   ++ " of the Cabal library "
 
-    progs = defaultProgramConfiguration
     commands =
-      [installCommand progs   `commandAddActionWithEmptyFlags` installAction
+      [installCommand         `commandAddActionWithEmptyFlags` installAction
       ,infoCommand            `commandAddAction` infoAction
       ,listCommand            `commandAddAction` listAction
       ,updateCommand          `commandAddAction` updateAction