twin/xmonad-contrib
1
0
Fork 0
mirror of https://github.com/xmonad/xmonad-contrib.git synced 2025-08-15 04:05:53 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix issue 551 by also getting manpath without -g flag.

Browse Source 
Instead of taking Ondrej's approach of figuring out which man (man-db or
http://primates.ximian.com/~flucifredi/man/) is used by the system, just try
both sets of flags.
This commit is contained in:
Adam Vogt
2013-07-16 03:05:36 +00:00
parent d3b2a01e3d
commit 7246defb90
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
XMonad/Prompt/Man.hs
View File

@@ -64,11 +64,15 @@ manPrompt c = do
getMans :: IO [String] getMans :: IO [String]
getMans = do getMans = do
paths <- getCommandOutput "manpath -g 2>/dev/null" `E.catch` paths <- do
\(E.SomeException _) -> return [] let getout cmd = getCommandOutput cmd `E.catch` \E.SomeException{} -> return ""
-- one of these combinations should give some output
p1 <- getout "manpath -g 2>/dev/null"
p2 <- getout "manpath 2>/dev/null"
return $ intercalate ":" $ lines $ p1 ++ p2
let sects = ["man" ++ show n | n <- [1..9 :: Int]] let sects = ["man" ++ show n | n <- [1..9 :: Int]]
dirs = [d ++ "/" ++ s | d <- split ':' paths, s <- sects] dirs = [d ++ "/" ++ s | d <- split ':' paths, s <- sects]
mans <- forM dirs $ \d -> do mans <- forM (nub dirs) $ \d -> do
exists <- doesDirectoryExist d exists <- doesDirectoryExist d
if exists if exists
then map (stripExt . stripSuffixes [".gz", ".bz2"]) `fmap` then map (stripExt . stripSuffixes [".gz", ".bz2"]) `fmap`