slaesvuo/hledger
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cli: give a non-confusing error when literal tilde found in LEDGER_FILE

Browse Source
This commit is contained in:
Simon Michael 2011-09-21 22:58:47 +00:00
parent 6019c932fb
commit f5eecc34a3
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hledger-lib/Hledger/Read.hs
View File

@ -137,6 +137,7 @@ readJournal format s = journalFromPathAndString format "(string)" s
myJournalPath :: IO String myJournalPath :: IO String
myJournalPath = do myJournalPath = do
s <- envJournalPath s <- envJournalPath
errorIfContainsTilde s
if null s then defaultJournalPath else return s if null s then defaultJournalPath else return s
where where
envJournalPath = getEnv journalenvvar `catch` (\_ -> getEnv journalenvvar2 `catch` (\_ -> return "")) envJournalPath = getEnv journalenvvar `catch` (\_ -> getEnv journalenvvar2 `catch` (\_ -> return ""))
@ -144,6 +145,8 @@ myJournalPath = do
home <- getHomeDirectory `catch` (\_ -> return "") home <- getHomeDirectory `catch` (\_ -> return "")
return $ home </> journaldefaultfilename return $ home </> journaldefaultfilename
errorIfContainsTilde s = when ('~' `elem` s) $ error' "unsupported literal ~ found in environment variable, please adjust"
-- | Get the user's default timelog file path. -- | Get the user's default timelog file path.
myTimelogPath :: IO String myTimelogPath :: IO String
myTimelogPath = myTimelogPath =