Replace fromJust with fromMaybe (fixes #18)

willdonnelly · Jun 28, 2016 · 0cd5b6e · 0cd5b6e
1 parent 971e2ec
commit 0cd5b6e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Config/Dyre/Options.hs b/Config/Dyre/Options.hs
@@ -28,7 +28,7 @@ module Config.Dyre.Options
   ) where
 
 import Data.List                     (isPrefixOf)
-import Data.Maybe                    (fromJust)
+import Data.Maybe                    (fromMaybe)
 import System.IO.Storage             (withStore, putValue, getValue, getDefaultValue)
 import System.Environment            (getArgs, getProgName, withArgs)
 import System.Environment.Executable (getExecutablePath)
@@ -115,7 +115,7 @@ customOptions otherArgs = do
             , case stateFile of
                    Nothing -> ""
                    Just sf -> "--dyre-state-persist=" ++ sf
-            , "--dyre-master-binary=" ++ fromJust masterPath
+            , "--dyre-master-binary=" ++ fromMaybe (error "'dyre' data-store doesn't exist (in Config.Dyre.Options.customOptions)") masterPath
             ])
     return args
 

diff --git a/Config/Dyre/Relaunch.hs b/Config/Dyre/Relaunch.hs
@@ -30,7 +30,7 @@ module Config.Dyre.Relaunch
   , restoreBinaryState
   ) where
 
-import Data.Maybe           ( fromMaybe, fromJust )
+import Data.Maybe           ( fromMaybe )
 import System.IO            ( writeFile, readFile )
 import Data.Binary          ( Binary, encodeFile, decodeFile )
 import Control.Exception    ( try, SomeException )
@@ -48,7 +48,7 @@ import Config.Dyre.Compat   ( customExec, getPIDString )
 --   value of 'Nothing', the current value of 'getArgs' will be used.
 relaunchMaster :: Maybe [String] -> IO ()
 relaunchMaster otherArgs = do
-    masterPath <- fmap fromJust getMasterBinary
+    masterPath <- fmap (fromMaybe $ error "'dyre' data-store doesn't exist (in Config.Dyre.Relaunch.relaunchMaster)") getMasterBinary
     customExec masterPath otherArgs
 
 -- | Relaunch the master binary, but first preserve the program