tb -trees ; rl ; path in gfe ; removed spurious "file not found"

2 files changed, 8 insertions, 4 deletions

diff --git a/src/GF/Infra/Option.hs b/src/GF/Infra/Option.hs
index 81ddd44af..0d0e7ad35 100644
--- a/src/GF/Infra/Option.hs
+++ b/src/GF/Infra/Option.hs
@@ -256,7 +256,8 @@ showMulti    = iOpt "multi"
 fromSource   = iOpt "src"
 makeConcrete = iOpt "examples"
 fromExamples = iOpt "ex"
-openEditor = iOpt "edit"
+openEditor   = iOpt "edit"
+getTrees     = iOpt "trees"
 
 -- ** mainly for stand-alone
 
diff --git a/src/GF/Infra/UseIO.hs b/src/GF/Infra/UseIO.hs
index 7bf9edaf1..76563b5ad 100644
--- a/src/GF/Infra/UseIO.hs
+++ b/src/GF/Infra/UseIO.hs
@@ -88,8 +88,11 @@ isSep :: Char -> Bool
 isSep c = c == '/' || c == '\\'
 
 getFilePath :: [FilePath] -> String -> IO (Maybe FilePath)
-getFilePath paths file = get paths where
-  get []     = putStrLnFlush ("file" +++ file +++ "not found") >> return Nothing
+getFilePath ps file = getFilePathMsg ("file" +++ file +++ "not found\n") ps file
+
+getFilePathMsg :: String -> [FilePath] -> String -> IO (Maybe FilePath)
+getFilePathMsg msg paths file = get paths where
+  get []     = putStrFlush msg >> return Nothing
   get (p:ps) = let pfile = prefixPathName p file in
                catch (readFile pfile >> return (Just pfile)) (\_ -> get ps)
 
@@ -104,7 +107,7 @@ readFileIfPath paths file = do
 
 doesFileExistPath :: [FilePath] -> String -> IOE Bool
 doesFileExistPath paths file = do
-  mpfile <- ioeIO $ getFilePath paths file
+  mpfile <- ioeIO $ getFilePathMsg "" paths file
   return $ maybe False (const True) mpfile
 
 -- | first var is lib prefix, second is like class path