diff options
| author | Jose Antonio Ortega Ruiz <jao@gnu.org> | 2011-08-21 19:48:44 +0200 |
|---|---|---|
| committer | Jose Antonio Ortega Ruiz <jao@gnu.org> | 2011-08-21 19:48:44 +0200 |
| commit | 1fab853cb8a76eb9b7c5400924a8c53b3b095712 (patch) | |
| tree | 54f20fb5987904700669d67519cc45169ae78bb7 /src/Plugins/Monitors/CoreTemp.hs | |
| parent | 8afb450eb104e5335f4b1b976512842f7059142c (diff) | |
| parent | 4a57c777bccbf169aa50411ecaed0af333ac6871 (diff) | |
| download | xmobar-1fab853cb8a76eb9b7c5400924a8c53b3b095712.tar.gz xmobar-1fab853cb8a76eb9b7c5400924a8c53b3b095712.tar.bz2 | |
Merge remote-tracking branch 'github/master'
Diffstat (limited to 'src/Plugins/Monitors/CoreTemp.hs')
| -rw-r--r-- | src/Plugins/Monitors/CoreTemp.hs | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/Plugins/Monitors/CoreTemp.hs b/src/Plugins/Monitors/CoreTemp.hs index a24b284..f7b5c95 100644 --- a/src/Plugins/Monitors/CoreTemp.hs +++ b/src/Plugins/Monitors/CoreTemp.hs @@ -31,11 +31,9 @@ coreTempConfig = mkMConfig -- Function retrieves monitor string holding the core temperature -- (or temperatures) runCoreTemp :: [String] -> Monitor String -runCoreTemp _ = do - let dir = "/sys/bus/platform/devices" - file = "temp1_input" - pattern = "coretemp." - divisor = 1e3 :: Double - failureMessage = "CoreTemp: N/A" - checkedDataRetrieval failureMessage dir file pattern (/divisor) show +runCoreTemp _ = let path = ["/sys/bus/platform/devices/coretemp.", "/temp", "_input"] + lbl = Just ("_label", read . drop 5) + divisor = 1e3 :: Double + failureMessage = "CoreTemp: N/A" + in checkedDataRetrieval failureMessage path lbl (/divisor) show |