cab 0.1.0 → 0.1.1

raw patch · 3 files changed

+16/−7 lines, 3 files

Files

Commands.hs +14/−5
Program.hs +1/−1
cab.cabal +1/−1

Commands.hs view

@@ -4,15 +4,16 @@  import Control.Applicative hiding (many) import Control.Monad+import Data.Char+import Data.List+import Data.Maybe import PkgDB import System.Exit import System.IO+import System.Process hiding (env) import Types import Utils import VerDB-import System.Process hiding (env)-import Data.List-import Data.Char  ---------------------------------------------------------------- @@ -155,12 +156,20 @@         putStrLn "unsetenv GHC_PACKAGE_PATH"     Just path -> do         pkgConf <- getPackageConf path+        gPkgConf <- globalPackageDB         putStrLn $ "export CAB_SANDBOX_PATH=" ++ path         putStrLn $ "setenv CAB_SANDBOX_PATH " ++ path         putStrLn ""         putStrLn "The following commands are not necessary in normal case."-        putStrLn $ "export GHC_PACKAGE_PATH=" ++ pkgConf-        putStrLn $ "setenv GHC_PACKAGE_PATH " ++ pkgConf+        let confs = gPkgConf ++ ":" ++ pkgConf+        putStrLn $ "export GHC_PACKAGE_PATH=" ++ confs+        putStrLn $ "setenv GHC_PACKAGE_PATH " ++ confs++globalPackageDB :: IO String+globalPackageDB = do+    res <- readProcess "ghc" ["--info"] []+    let alist = read res :: [(String,String)]+    return . fromJust $ lookup "Global Package DB" alist  ----------------------------------------------------------------

Program.hs view

@@ -1,7 +1,7 @@ module Program where  version :: String-version = "0.1.0"+version = "0.1.1"  programName :: String programName = "cab"

cab.cabal view

@@ -1,5 +1,5 @@ Name:                   cab-Version:                0.1.0+Version:                0.1.1 Author:                 Kazu Yamamoto <kazu@iij.ad.jp> Maintainer:             Kazu Yamamoto <kazu@iij.ad.jp> License:                BSD3