From 9c02d7342fc861bd7d5f846d36def117ec4e9247 Mon Sep 17 00:00:00 2001
From: Jens Nolte <jens@nightmarestudio.de>
Date: Sat, 29 Feb 2020 05:26:34 +0100
Subject: [PATCH] Fix cli: swap 'script' and 'script --persistent'
---
src/QBar/Blocks/Script.hs | 6 +++---
src/QBar/Cli.hs | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/QBar/Blocks/Script.hs b/src/QBar/Blocks/Script.hs
index 4e9b8ba..8dcf0fa 100644
--- a/src/QBar/Blocks/Script.hs
+++ b/src/QBar/Blocks/Script.hs
@@ -26,11 +26,11 @@ scriptBlock path = forever $ updateBlock =<< (lift blockScriptAction)
-- I am trying to replace i3blocks scripts with native haskell blocks, so I do not need it
(exitCode, output) <- liftIO $ readProcessStdout $ shell path
return $ case exitCode of
- ExitSuccess -> createScriptBlock output
+ ExitSuccess -> createScriptBlockOutput output
(ExitFailure nr) -> case nr of
_ -> mkErrorOutput $ "exit code " <> T.pack (show nr) <> ""
- createScriptBlock :: C8.ByteString -> BlockOutput
- createScriptBlock output = case map E.decodeUtf8 (C8.lines output) of
+ createScriptBlockOutput :: C8.ByteString -> BlockOutput
+ createScriptBlockOutput output = case map E.decodeUtf8 (C8.lines output) of
(text:short:_) -> parseTags'' text short
(text:_) -> parseTags' text
[] -> emptyBlock
diff --git a/src/QBar/Cli.hs b/src/QBar/Cli.hs
index 7e4eeab..702c8a3 100644
--- a/src/QBar/Cli.hs
+++ b/src/QBar/Cli.hs
@@ -85,4 +85,4 @@ scriptBlockParser :: Parser (BarIO ())
scriptBlockParser = helper <*> do
persistent <- switch $ long "persistent" <> short 'p' <> help "Run script in persistent mode (every line of output updates the block)."
script <- strArgument (metavar "SCRIPT" <> help "The script that will be executed with a shell.")
- return $ (if persistent then addBlock . scriptBlock else addBlock . persistentScriptBlock) script
+ return $ (if persistent then addBlock . persistentScriptBlock else addBlock . scriptBlock) script
--
GitLab