prefer xdot over dot
* map: Run xdot if it's available in PATH. On OSX, the dot command does not support graphical display, while xdot does. * Debian: xdot is a better interactive viewer than dot, so Suggest xdot, rather than graphviz.
This commit is contained in:
parent
61a0be4fb0
commit
8354612131
4 changed files with 25 additions and 11 deletions
|
@ -47,15 +47,25 @@ start = do
|
|||
liftIO $ writeFile file (drawMap rs trustmap umap)
|
||||
next $ next $
|
||||
ifM (Annex.getState Annex.fast)
|
||||
( do
|
||||
showLongNote $ "left map in " ++ file
|
||||
return True
|
||||
, do
|
||||
showLongNote $ "running: dot -Tx11 " ++ file
|
||||
showOutput
|
||||
liftIO $ boolSystem "dot" [Param "-Tx11", File file]
|
||||
( runViewer file []
|
||||
, runViewer file
|
||||
[ ("xdot", [File file])
|
||||
, ("dot", [Param "-Tx11", File file])
|
||||
]
|
||||
)
|
||||
|
||||
runViewer :: FilePath -> [(String, [CommandParam])] -> Annex Bool
|
||||
runViewer file [] = do
|
||||
showLongNote $ "left map in " ++ file
|
||||
return True
|
||||
runViewer file ((c, ps):rest) = ifM (liftIO $ inPath c)
|
||||
( do
|
||||
showLongNote $ "running: " ++ c ++ unwords (toCommand ps)
|
||||
showOutput
|
||||
liftIO $ boolSystem c ps
|
||||
, runViewer file rest
|
||||
)
|
||||
|
||||
{- Generates a graph for dot(1). Each repository, and any other uuids
|
||||
- (except for dead ones), are displayed as a node, and each of its
|
||||
- remotes is represented as an edge pointing at the node for the remote.
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue