X-Git-Url: http://gitweb.michael.orlitzky.com/?p=list-remote-forwards.git;a=blobdiff_plain;f=src%2FMain.hs;h=7a17f077f8ad375a2f365ce53bb1b510d39c5958;hp=13371a836d9f7c537583842241db904ec39df1c8;hb=HEAD;hpb=8e5a377920002012c38066a2d21b6393a78c677a

diff --git a/src/Main.hs b/src/Main.hs
index 13371a8..7a17f07 100644
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -1,12 +1,13 @@
 {-# LANGUAGE DoAndIfThenElse #-}
 {-# LANGUAGE NoMonomorphismRestriction #-}
-module Main
+module Main (main)
 where
 
 import Data.Maybe ( fromMaybe )
-import Data.Monoid ( (<>) )
 import Data.String.Utils ( join )
-import Database.HDBC ( SqlError(..), handleSql )
+import Database.HDBC (
+  SqlError(seNativeError, seErrorMsg),
+  handleSql )
 import Database.HDBC.PostgreSQL ( connectPostgreSQL )
 import Database.HDBC.Sqlite3 ( connectSqlite3 )
 import System.Console.CmdArgs ( def )
@@ -14,7 +15,9 @@ import System.Directory ( doesFileExist )
 import System.IO ( hPutStrLn, stderr )
 
 import CommandLine ( get_args )
-import Configuration ( Configuration(..), merge_optional )
+import Configuration (
+  Configuration(database, host, password, port, username),
+  merge_optional )
 import qualified OptionalConfiguration as OC ( from_rc )
 import Report ( report )
 import String ( trim )
@@ -74,9 +77,9 @@ main = do
           else connectPostgreSQL (connection_string cfg) >>= report cfg
 
     -- The DB connection is implicitly closed when it gets garbage collected.
-    putStrLn r
+    putStr r
 
   where
     show_sql_error :: SqlError -> IO ()
     show_sql_error se = hPutStrLn stderr $
-      "SQL Error (" ++ (show $ seNativeError se) ++ "): " ++ (seErrorMsg se)
+      "SQL Error (" ++ show (seNativeError se) ++ "): " ++ (seErrorMsg se)