a few fixes

Author: U-CIQDEV\gbazerman

hptool/src/Main.hs

@@ -8,6 +8,7 @@ import Development.Shake
 import Development.Shake.FilePath
 import System.Console.GetOpt
 import qualified System.Info (os, arch)
+import System.IO
 
 import Config
 import Dirs
@@ -31,12 +32,12 @@ flags = [ Option ['i'] ["info"] (NoArg $ Right Info)
                      "Show info on what gets included in this HP release"
         , Option [] ["prefix"] (ReqArg (Right . Prefix) "DIR")
                      "Set installation prefix (only for Posix builds)"
-        , Option ['f'] ["full"] (NoArg $ Right Info)
+        , Option ['f'] ["full"] (NoArg $ Right Full)
                      "Do a full (rather than minimal) build of the platform."
         ]
 
 main :: IO ()
-main = shakeArgsWith opts flags main'
+main = hSetEncoding stdout utf8 >> shakeArgsWith opts flags main'
   where
     main' flgs args =
         if Info `elem` flgs

hptool/src/Types.hs

@@ -15,9 +15,7 @@ module Types
     )
   where
 
-#if MIN_VERSION_base(4,6,0)
-import Control.Applicative ((<$>), (<*>))
-#endif
+import Control.Applicative
 import Data.Char (isDigit)
 import Data.List (intercalate)
 import Data.Version (Version, showVersion, parseVersion)
@@ -42,11 +40,7 @@ readPackageP = do
     ver <- parseVersion
     return $ Package (intercalate "-" parts) ver
   where
-#if MIN_VERSION_base(4,6,0)
     part = (:) <$> satisfy lead <*> munch more
-#else
-    part = do { l <- satisfy lead; m <- munch more; return (l:m) }
-#endif
 
     lead c = not (isDigit c) && more c
     more c = c /= '-'

hptool/src/Website.hs

@@ -137,17 +137,17 @@ extendedCtx name = mkStrContext ctx
     pCtx pName "package" = MuVariable pName
     pCtx pName "hackageUrl" =
         MuVariable $ "http://hackage.haskell.org/package/" ++ pName
-    pCtx pName "releases" = mapListStrContext pvCtx $ packageVersionInfo pName
+    pCtx pName "releases" = mapListStrContext pvCtx $ packageVersionInfo True pName
     pCtx _ _ = MuNothing
 
     pvCtx (c, _) "class" = MuVariable c
     pvCtx (_, v) "version" = MuVariable v
     pvCtx _ _ = MuNothing
 
-packageVersionInfo :: String -> [(String, String)]
-packageVersionInfo pName = curr $ zipWith comp vers (drop 1 vers ++ [Nothing])
+packageVersionInfo :: Bool -> String -> [(String, String)]
+packageVersionInfo searchFull pName = curr $ zipWith comp vers (drop 1 vers ++ [Nothing])
   where
-    comp Nothing  _                         = ("missing", "—")
+    comp Nothing  _                         = ("missing", "-")
     comp (Just v) Nothing                   = ("update", showVersion v)
     comp (Just v) (Just w) | maj v == maj w = ("same",   showVersion v)
                            | otherwise      = ("update", showVersion v)