mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

add searchPathContents

Browse source 
And rename related functions for consistency.
This commit is contained in:
Joey Hess 2021-02-02 19:01:45 -04:00
parent aec2cf0abe
commit 1b63132ca3
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
18 changed files with 60 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Command/Assistant.hs
View file

@ -79,7 +79,7 @@ autoStart o = do
f <- autoStartFile
giveup $ "Nothing listed in " ++ f
program <- programPath
haveionice <- pure BuildInfo.ionice <&&> inPath "ionice"
haveionice <- pure BuildInfo.ionice <&&> inSearchPath "ionice"
pids <- forM dirs $ \d -> do
putStrLn $ "git-annex autostart in " ++ d
mpid <- catchMaybeIO $ go haveionice program d

2
Command/Map.hs
View file

@ -64,7 +64,7 @@ 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)
runViewer file ((c, ps):rest) = ifM (liftIO $ inSearchPath c)
( do
showLongNote $ "running: " ++ c ++ unwords (toCommand ps)
showOutput