From b88804d41b84ab9e3bd4da96ba32a66a24126e01 Mon Sep 17 00:00:00 2001 From: Jens Nolte <jens@nightmarestudio.de> Date: Mon, 3 Feb 2020 02:18:55 +0100 Subject: [PATCH] Rename persistentBlockScript to startPersistentBlockScript --- src/QBar/Core.hs | 4 ++-- src/QBar/DefaultConfig.hs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/QBar/Core.hs b/src/QBar/Core.hs index 530a297..d3fbcb5 100644 --- a/src/QBar/Core.hs +++ b/src/QBar/Core.hs @@ -242,9 +242,9 @@ blockScript path = forever $ updateBlock =<< (lift blockScriptAction) createScriptBlock' :: Bool -> Importance -> T.Text -> BlockOutput createScriptBlock' active importance text = blockName ?~ T.pack path $ mkBlockOutput $ mkText active importance text -startPersistentBlockScript :: FilePath -> PushBlock +persistentBlockScript :: FilePath -> PushBlock -- The outer catchP only catches errors that occur during process creation -startPersistentBlockScript path = catchP startScriptProcess handleError +persistentBlockScript path = catchP startScriptProcess handleError where handleError :: IOException -> PushBlock handleError e = do diff --git a/src/QBar/DefaultConfig.hs b/src/QBar/DefaultConfig.hs index 4d35356..8118633 100644 --- a/src/QBar/DefaultConfig.hs +++ b/src/QBar/DefaultConfig.hs @@ -21,7 +21,7 @@ generateDefaultBarConfig = do let cpu = systemInfoInterval (blockScript $ blockLocation "cpu_usage") >-> modify ((blockName ?~ "cpu") . addIcon "💻\xFE0E") >-> autoPadding let ram = systemInfoInterval (blockScript $ blockLocation "memory") >-> modify (addIcon "ðŸ\xFE0E") >-> autoPadding let temperature = systemInfoInterval (blockScript $ blockLocation "temperature") >-> autoPadding - let volumeBlock = startPersistentBlockScript $ blockLocation "volume-pulseaudio -S -F3" + let volumeBlock = persistentBlockScript $ blockLocation "volume-pulseaudio -S -F3" let battery = systemInfoInterval $ batteryBlock >-> modify (blockName ?~ "battery") addBlock dateBlock -- GitLab