From b94e1b3da24d2a7d7b7d60590efc20d01641d805 Mon Sep 17 00:00:00 2001 From: Spencer Janssen Date: Tue, 8 Dec 2009 05:07:29 +0100 Subject: A few tweaks to --verbose-version Ignore-this: cf3d6a904d23891829c10f4966974673 darcs-hash:20091208040729-25a6b-67a1ed2a483e9beb425f833f9487f1abeb720a26 --- Main.hs | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'Main.hs') diff --git a/Main.hs b/Main.hs index abcab51..2d16db6 100644 --- a/Main.hs +++ b/Main.hs @@ -26,6 +26,8 @@ import System.Exit (exitFailure) import Paths_xmonad (version) import Data.Version (showVersion) +import Graphics.X11.Xinerama (compiledWithXinerama) + #ifdef TESTING import qualified Properties #endif @@ -43,13 +45,17 @@ main = do ["--help"] -> usage ["--recompile"] -> recompile True >>= flip unless exitFailure ["--restart"] -> sendRestart >> return () - ["--version"] -> putStrLn ("xmonad " ++ showVersion version) - ["--verbose-version"] -> putStrLn ("xmonad " ++ showVersion version ++ " compiled by " ++ compilerName - ++ " " ++ showVersion compilerVersion ++ " for " ++ os ++ "/" ++ arch) + ["--version"] -> putStrLn $ unwords shortVersion + ["--verbose-version"] -> putStrLn . unwords $ shortVersion ++ longVersion #ifdef TESTING ("--run-tests":_) -> Properties.main #endif _ -> fail "unrecognized flags" + where + shortVersion = ["xmonad", showVersion version] + longVersion = [ "compiled by", compilerName, showVersion compilerVersion + , "for", arch ++ "-" ++ os + , "\nXinerama:", show compiledWithXinerama ] usage :: IO () usage = do -- cgit v1.2.3