imp: interpret glob patterns in $LEDGER_FILE
For example, LEDGER_FILE=2???.journal now works.
This commit is contained in:
parent
e6b3fa0f54
commit
f6a50923c2
@ -140,7 +140,7 @@ import Data.Text (Text)
|
|||||||
import qualified Data.Text as T
|
import qualified Data.Text as T
|
||||||
import qualified Data.Text.IO as T
|
import qualified Data.Text.IO as T
|
||||||
import Data.Time (Day)
|
import Data.Time (Day)
|
||||||
import Safe (headDef)
|
import Safe (headDef, headMay)
|
||||||
import System.Directory (doesFileExist, getHomeDirectory)
|
import System.Directory (doesFileExist, getHomeDirectory)
|
||||||
import System.Environment (getEnv)
|
import System.Environment (getEnv)
|
||||||
import System.Exit (exitFailure)
|
import System.Exit (exitFailure)
|
||||||
@ -184,8 +184,12 @@ defaultJournal = defaultJournalPath >>= runExceptT . readJournalFile definputopt
|
|||||||
-- determine a home directory).
|
-- determine a home directory).
|
||||||
defaultJournalPath :: IO String
|
defaultJournalPath :: IO String
|
||||||
defaultJournalPath = do
|
defaultJournalPath = do
|
||||||
s <- envJournalPath
|
p <- envJournalPath
|
||||||
if null s then defpath else return s
|
if null p
|
||||||
|
then defpath
|
||||||
|
else do
|
||||||
|
ps <- expandGlob "." p `C.catch` (\(_::C.IOException) -> return [])
|
||||||
|
maybe defpath return $ headMay ps
|
||||||
where
|
where
|
||||||
envJournalPath =
|
envJournalPath =
|
||||||
getEnv journalEnvVar
|
getEnv journalEnvVar
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user