fuzzytime 0.7.5 → 0.7.5.1
raw patch · 6 files changed
+21/−18 lines, 6 files
Files
- CHANGELOG +4/−1
- INSTALL +1/−1
- README +1/−1
- fuzzytime.cabal +2/−2
- src/fuzzytime.1 +2/−2
- src/fuzzytime.hs +11/−11
CHANGELOG view
@@ -6,7 +6,10 @@ read default language from $LANG (hFlush!) daemon? -0.7.5+0.7.5.1 2011.11.29+ bugfix (thanks Sara)++0.7.5 2011.11.28 added config for alarm sound 0.7.4.1 2011.08.01
INSTALL view
@@ -1,4 +1,4 @@-fuzzytime 0.7.5 (2011.11.28)+fuzzytime 0.7.5.1 (2011.11.29) A clock and timer that tell the time in a more human way (the 'ten past six'-style)
README view
@@ -15,7 +15,7 @@ ### --help A clock and timer that tell the time in a more human way.-v0.7.5, 2011.11.28, *antispam*, GPL3++v0.7.5.1, 2011.11.29, *antispam*, GPL3+ fuzzytime [COMMAND] ... [OPTIONS]
fuzzytime.cabal view
@@ -1,5 +1,5 @@ name: fuzzytime-version: 0.7.5+version: 0.7.5.1 description: A clock and timer that tell the time in a more human way (the 'ten past six' style) synopsis: A 'ten past six' style clock category: Utils@@ -41,4 +41,4 @@ source-repository this type: git location: https://github.com/caminoix/fuzzytime- tag: 0.7.5+ tag: 0.7.5.1
src/fuzzytime.1 view
@@ -1,4 +1,4 @@-.TH fuzzytime 1 "November 28, 2011" "version 0.7.5" "A fuzzy clock and timer"+.TH fuzzytime 1 "November 29, 2011" "version 0.7.5.1" "A fuzzy clock and timer" .\" ------------------------------------------------------------------------------------- @@ -55,7 +55,7 @@ Time to fuzzify as HH:MM; the default is the current time. Affects timer. .TP \-o \--sound-Command to play the alarm sound; the default is "aplay /usr/share/fuzzytime/sound.wav &> /dev/null" to reduce the dependencies.+Command to play the alarm sound; the default is "aplay /usr/share/fuzzytime/sound.wav &> /dev/null" so as to avoid mp3 players and such in the dependencies. The "&> /dev/null" bit is there to avoid having fuzzytime display the output from the player instead of the time. .TP \-s \--style How the time is told; see below; the default is 1. Does not affect timer.
src/fuzzytime.hs view
@@ -183,7 +183,7 @@ -- | \[config] Help message for summary confHelpSummary :: String-confHelpSummary = "A clock and timer that tell the time in a more human way.\nv0.7.5, 2011.11.28, kamil.stachowski@gmail.com, GPL3+"+confHelpSummary = "A clock and timer that tell the time in a more human way.\nv0.7.5.1, 2011.11.29, kamil.stachowski@gmail.com, GPL3+" -- check --------------------------------------------------------------------------------------------------------------------------------------------------------------------------@@ -241,13 +241,13 @@ timerConf <- getDefTimerConf conf <- cmdArgs (modes [clockConf, timerConf] &= program confHelpProgram &= summary confHelpSummary) case conf of- (ClockConf _ _ _ _ _ _ _) -> runModeShow $ if end timerConf == "empty" then- conf- else- timerConf {- lang = lang conf,- now = time conf- }+ (ClockConf _ _ _ _ _ _ _) -> runModeShow (if end timerConf == "empty" then+ conf+ else+ timerConf {+ lang = lang conf,+ now = time conf+ }) (sound conf) tc@(TimerConf _ _ _) -> runModeTimer tc @@ -255,13 +255,13 @@ -- | The time-showing mode.-runModeShow :: FuzzyTimeConf -> IO ()-runModeShow conf =+runModeShow :: FuzzyTimeConf -> String -> IO ()+runModeShow conf snd = case checkFTConf conf of Left e -> exitWithError e Right c -> do let ftime = toFuzzyTime c- when (isTimerZero ftime) (do _ <- system (sound conf); return ())+ when (isTimerZero ftime) (do _ <- system snd; return ()) print ftime