From e4b0a5ed59c168d1802648659e087a8191589c1f Mon Sep 17 00:00:00 2001 From: Chuck Date: Thu, 5 Sep 2019 11:11:12 -0700 Subject: Write error log to data dir, not conf dir Write xmobar.errors to XMOBAR_DATA_DIR, not XMOBAR_CONFIG_DIR. This allows XMOBAR_CONFIG_DIR to be read-only. This brings xmobar into alignment with how xmonad manages its analogous directories (before this change, a read-only DATA dir worked with xmonad but not with xmobar). --- src/Xmobar/App/Compile.hs | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/Xmobar/App/Compile.hs') diff --git a/src/Xmobar/App/Compile.hs b/src/Xmobar/App/Compile.hs index 0a763b4..bcb18d0 100644 --- a/src/Xmobar/App/Compile.hs +++ b/src/Xmobar/App/Compile.hs @@ -131,13 +131,13 @@ trace verb msg = when verb (liftIO $ hPutStrLn stderr msg) -- -- 'False' is returned if there are compilation errors. -- -recompile :: MonadIO m => String -> String -> Bool -> Bool -> m Bool -recompile dir execName force verb = liftIO $ do - let bin = dir execName - err = dir (execName ++ ".errors") - src = dir (execName ++ ".hs") - lib = dir "lib" - script = dir "build" +recompile :: MonadIO m => String -> String -> String -> Bool -> Bool -> m Bool +recompile confDir dataDir execName force verb = liftIO $ do + let bin = confDir execName + err = dataDir (execName ++ ".errors") + src = confDir (execName ++ ".hs") + lib = confDir "lib" + script = confDir "build" useScript <- checkBuildScript verb script sc <- if useScript || force then return True @@ -149,8 +149,8 @@ recompile dir execName force verb = liftIO $ do \errHandle -> waitForProcess =<< if useScript - then runScript script bin dir errHandle - else runGHC bin dir errHandle + then runScript script bin confDir errHandle + else runGHC bin confDir errHandle installSignalHandlers if status == ExitSuccess then trace verb "Xmobar recompilation process exited with success!" -- cgit v1.2.3