From 6fc4f0cfcb809b51048e6a3d952b9c887e07b13b Mon Sep 17 00:00:00 2001 From: jao Date: Sun, 2 Dec 2018 05:50:56 +0000 Subject: Fix: exposing the Command constructors in lib --- src/Xmobar/Plugins/BufferedPipeReader.hs | 2 +- src/Xmobar/Plugins/CommandReader.hs | 2 +- src/Xmobar/Plugins/Date.hs | 2 +- src/Xmobar/Plugins/DateZone.hs | 2 +- src/Xmobar/Plugins/EWMH.hs | 2 +- src/Xmobar/Plugins/Kbd.hs | 2 +- src/Xmobar/Plugins/Locks.hs | 2 +- src/Xmobar/Plugins/MBox.hs | 2 +- src/Xmobar/Plugins/Mail.hs | 2 +- src/Xmobar/Plugins/MarqueePipeReader.hs | 2 +- src/Xmobar/Plugins/Monitors.hs | 2 +- src/Xmobar/Plugins/Monitors/Common/Run.hs | 2 +- src/Xmobar/Plugins/PipeReader.hs | 2 +- src/Xmobar/Plugins/StdinReader.hs | 2 +- src/Xmobar/Plugins/XMonadLog.hs | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) (limited to 'src/Xmobar/Plugins') diff --git a/src/Xmobar/Plugins/BufferedPipeReader.hs b/src/Xmobar/Plugins/BufferedPipeReader.hs index ee02355..f98d0d4 100644 --- a/src/Xmobar/Plugins/BufferedPipeReader.hs +++ b/src/Xmobar/Plugins/BufferedPipeReader.hs @@ -20,7 +20,7 @@ import Control.Concurrent.STM import System.IO import System.IO.Unsafe(unsafePerformIO) -import Xmobar.Run.Commands +import Xmobar.Run.Exec import Xmobar.System.Signal import Xmobar.System.Environment import Xmobar.System.Utils(hGetLineSafe) diff --git a/src/Xmobar/Plugins/CommandReader.hs b/src/Xmobar/Plugins/CommandReader.hs index 4e39d72..9cf6d0e 100644 --- a/src/Xmobar/Plugins/CommandReader.hs +++ b/src/Xmobar/Plugins/CommandReader.hs @@ -16,7 +16,7 @@ module Xmobar.Plugins.CommandReader(CommandReader(..)) where import System.IO -import Xmobar.Run.Commands +import Xmobar.Run.Exec import Xmobar.System.Utils (hGetLineSafe) import System.Process(runInteractiveCommand, getProcessExitCode) diff --git a/src/Xmobar/Plugins/Date.hs b/src/Xmobar/Plugins/Date.hs index 62a4ee7..1cb0596 100644 --- a/src/Xmobar/Plugins/Date.hs +++ b/src/Xmobar/Plugins/Date.hs @@ -19,7 +19,7 @@ module Xmobar.Plugins.Date (Date(..)) where -import Xmobar.Run.Commands +import Xmobar.Run.Exec #if ! MIN_VERSION_time(1,5,0) import System.Locale diff --git a/src/Xmobar/Plugins/DateZone.hs b/src/Xmobar/Plugins/DateZone.hs index c2e80da..22be6c2 100644 --- a/src/Xmobar/Plugins/DateZone.hs +++ b/src/Xmobar/Plugins/DateZone.hs @@ -22,7 +22,7 @@ module Xmobar.Plugins.DateZone (DateZone(..)) where -import Xmobar.Run.Commands +import Xmobar.Run.Exec #ifdef DATEZONE import Control.Concurrent.STM diff --git a/src/Xmobar/Plugins/EWMH.hs b/src/Xmobar/Plugins/EWMH.hs index 5b68620..6440940 100644 --- a/src/Xmobar/Plugins/EWMH.hs +++ b/src/Xmobar/Plugins/EWMH.hs @@ -22,7 +22,7 @@ import Control.Monad.State import Control.Monad.Reader import Graphics.X11 hiding (Modifier, Color) import Graphics.X11.Xlib.Extras -import Xmobar.Run.Commands +import Xmobar.Run.Exec #ifdef UTF8 #undef UTF8 import Codec.Binary.UTF8.String as UTF8 diff --git a/src/Xmobar/Plugins/Kbd.hs b/src/Xmobar/Plugins/Kbd.hs index 6654163..a8a8cdc 100644 --- a/src/Xmobar/Plugins/Kbd.hs +++ b/src/Xmobar/Plugins/Kbd.hs @@ -20,7 +20,7 @@ import Control.Monad (forever) import Graphics.X11.Xlib import Graphics.X11.Xlib.Extras -import Xmobar.Run.Commands +import Xmobar.Run.Exec import Xmobar.X11.Events (nextEvent') import Xmobar.System.Kbd diff --git a/src/Xmobar/Plugins/Locks.hs b/src/Xmobar/Plugins/Locks.hs index 25d2946..9176312 100644 --- a/src/Xmobar/Plugins/Locks.hs +++ b/src/Xmobar/Plugins/Locks.hs @@ -19,7 +19,7 @@ import Data.List import Data.Bits import Control.Monad import Graphics.X11.Xlib.Extras -import Xmobar.Run.Commands +import Xmobar.Run.Exec import Xmobar.System.Kbd import Xmobar.X11.Events (nextEvent') diff --git a/src/Xmobar/Plugins/MBox.hs b/src/Xmobar/Plugins/MBox.hs index 7eaa998..311f26e 100644 --- a/src/Xmobar/Plugins/MBox.hs +++ b/src/Xmobar/Plugins/MBox.hs @@ -16,7 +16,7 @@ module Xmobar.Plugins.MBox (MBox(..)) where import Prelude -import Xmobar.Run.Commands +import Xmobar.Run.Exec #ifdef INOTIFY import Xmobar.System.Utils (changeLoop, expandHome) diff --git a/src/Xmobar/Plugins/Mail.hs b/src/Xmobar/Plugins/Mail.hs index e67817b..7325087 100644 --- a/src/Xmobar/Plugins/Mail.hs +++ b/src/Xmobar/Plugins/Mail.hs @@ -15,7 +15,7 @@ module Xmobar.Plugins.Mail(Mail(..)) where -import Xmobar.Run.Commands +import Xmobar.Run.Exec #ifdef INOTIFY import Xmobar.System.Utils (expandHome, changeLoop) diff --git a/src/Xmobar/Plugins/MarqueePipeReader.hs b/src/Xmobar/Plugins/MarqueePipeReader.hs index a139aba..28e9ed5 100644 --- a/src/Xmobar/Plugins/MarqueePipeReader.hs +++ b/src/Xmobar/Plugins/MarqueePipeReader.hs @@ -16,7 +16,7 @@ module Xmobar.Plugins.MarqueePipeReader where import System.IO (openFile, IOMode(ReadWriteMode), Handle) import Xmobar.System.Environment -import Xmobar.Run.Commands(Exec(alias, start), tenthSeconds) +import Xmobar.Run.Exec(Exec(alias, start), tenthSeconds) import Xmobar.System.Utils(hGetLineSafe) import System.Posix.Files (getFileStatus, isNamedPipe) import Control.Concurrent(forkIO, threadDelay) diff --git a/src/Xmobar/Plugins/Monitors.hs b/src/Xmobar/Plugins/Monitors.hs index fe909d8..3e7584f 100644 --- a/src/Xmobar/Plugins/Monitors.hs +++ b/src/Xmobar/Plugins/Monitors.hs @@ -17,7 +17,7 @@ module Xmobar.Plugins.Monitors where -import Xmobar.Run.Commands +import Xmobar.Run.Exec import Xmobar.Plugins.Monitors.Common (runM, runMD) #ifdef WEATHER diff --git a/src/Xmobar/Plugins/Monitors/Common/Run.hs b/src/Xmobar/Plugins/Monitors/Common/Run.hs index 5422d71..74a7695 100644 --- a/src/Xmobar/Plugins/Monitors/Common/Run.hs +++ b/src/Xmobar/Plugins/Monitors/Common/Run.hs @@ -27,7 +27,7 @@ import Control.Monad.Reader import System.Console.GetOpt import Xmobar.Plugins.Monitors.Common.Types -import Xmobar.Run.Commands (tenthSeconds) +import Xmobar.Run.Exec (tenthSeconds) options :: [OptDescr Opts] options = diff --git a/src/Xmobar/Plugins/PipeReader.hs b/src/Xmobar/Plugins/PipeReader.hs index d7b6a56..9c6e628 100644 --- a/src/Xmobar/Plugins/PipeReader.hs +++ b/src/Xmobar/Plugins/PipeReader.hs @@ -15,7 +15,7 @@ module Xmobar.Plugins.PipeReader(PipeReader(..)) where import System.IO -import Xmobar.Run.Commands(Exec(..)) +import Xmobar.Run.Exec(Exec(..)) import Xmobar.System.Utils(hGetLineSafe) import Xmobar.System.Environment(expandEnv) import System.Posix.Files diff --git a/src/Xmobar/Plugins/StdinReader.hs b/src/Xmobar/Plugins/StdinReader.hs index 7f5f2ae..4b80044 100644 --- a/src/Xmobar/Plugins/StdinReader.hs +++ b/src/Xmobar/Plugins/StdinReader.hs @@ -23,7 +23,7 @@ import System.Posix.Process import System.Exit import System.IO import Control.Exception (SomeException(..), handle) -import Xmobar.Run.Commands +import Xmobar.Run.Exec import Xmobar.X11.Actions (stripActions) import Xmobar.System.Utils (hGetLineSafe) diff --git a/src/Xmobar/Plugins/XMonadLog.hs b/src/Xmobar/Plugins/XMonadLog.hs index 8261980..0bf62e1 100644 --- a/src/Xmobar/Plugins/XMonadLog.hs +++ b/src/Xmobar/Plugins/XMonadLog.hs @@ -20,7 +20,7 @@ module Xmobar.Plugins.XMonadLog (XMonadLog(..)) where import Control.Monad import Graphics.X11 import Graphics.X11.Xlib.Extras -import Xmobar.Run.Commands +import Xmobar.Run.Exec #ifdef UTF8 #undef UTF8 import Codec.Binary.UTF8.String as UTF8 -- cgit v1.2.3