From 1c94c1fe0a99fff34b491d0e275240f1b8c4e641 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Sun, 21 Jun 2015 20:12:33 +0200 Subject: Removed infinite loop caused by name colission --- adjmix/Adjmix.hs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'adjmix/Adjmix.hs') diff --git a/adjmix/Adjmix.hs b/adjmix/Adjmix.hs index 49b820f..645ac6a 100644 --- a/adjmix/Adjmix.hs +++ b/adjmix/Adjmix.hs @@ -19,6 +19,7 @@ optionParser = Options <$> strOption ( long "base" <> metavar "DIRECTORY" <> value "/dev/shm/mix" + <> showDefault ) <*> strOption ( long "target" <> short 't' @@ -29,6 +30,7 @@ optionParser = Options <> metavar "FILENAME" <> value "level" <> help "Filename of the level file" + <> showDefault ) <*> ( ( Set <$> option auto ( long "set" <> short 'o' @@ -58,12 +60,12 @@ main = execParser opts >>= adjmix adjmix :: Options -> IO () adjmix Options{..} = do - oldLevel <- readFile levelFile >>= readIO . stripSpace + oldLevel <- readFile levelFile' >>= readIO . stripSpace let newLevel = oldLevel `doAdjustment` adjustment - writeFile levelFile (show newLevel ++ "\n") + writeFile levelFile' (show newLevel ++ "\n") where - levelFile = baseDirectory targetDirectory levelFile + levelFile' = baseDirectory targetDirectory levelFile stripSpace = reverse . stripSpace' . reverse . stripSpace' stripSpace' [] = [] stripSpace' l@(x:xs) = if isSpace x -- cgit v1.2.3