Use executable-path to reliably find the contrib/ directory

Author: nomeata

src/PlaySound.hs

@@ -9,13 +9,15 @@ import Control.Exception
 import System.IO.Error
 import System.IO
 import System.Directory
+import System.FilePath
 import qualified Data.ByteString.Lazy as B
+import System.Environment.Executable
 
 
-players :: String -> [(FilePath, [String])]
-players fn =
-    [ ("sox",                ["-q", fn, "-d"])
-    , ("./contrib/playmus",  [fn])
+players :: FilePath -> FilePath -> [(FilePath, [String])]
+players myDir fn =
+    [ ("sox",                              ["-q", fn, "-d"])
+    , (myDir </> "contrib" </> "playmus",  [fn])
     ]
 
 playSound :: B.ByteString -> IO ()
@@ -25,7 +27,9 @@ playSound content = do
     B.hPutStr h content
     hClose h
 
-    tryPrograms (players  tmp) $ do
+    (myDir,_) <- splitExecutablePath
+
+    tryPrograms (players myDir tmp) $ do
         putStrLn "Could not play audio file."
         putStrLn "Do you have \"sox\" installed?"
 

src/TextToSpeech.hs

@@ -14,6 +14,7 @@ import Control.Exception
 import System.IO.Error
 import System.Environment
 import System.Info (os)
+import System.Environment.Executable
 
 import Language
 
@@ -40,22 +41,22 @@ espeak :: Language -> FilePath -> String -> (String, [String])
 espeak lang tmp txt =
  ("espeak", ["-v", l, "-w", tmp, "-s", "120", txt])
   where
-    l = case lang of 
+    l = case lang of
             Language s    -> s
 
-espeak_contrib :: Language -> FilePath -> String -> (String, [String])
-espeak_contrib lang tmp txt =
- ("./contrib/espeak", ["-v", l, "-w", tmp, "-s", "120", txt])
+espeak_contrib :: FilePath -> Language -> FilePath -> String -> (String, [String])
+espeak_contrib myDir lang tmp txt =
+ (myDir </> "contrib" </> "espeak", ["-v", l, "-w", tmp, "-s", "120", txt])
   where
-    l = case lang of 
+    l = case lang of
             Language s    -> s
 
 
-engines :: Language -> FilePath -> String -> [(String, [String])]
-engines l ft txt =
+engines :: FilePath -> Language -> FilePath -> String -> [(String, [String])]
+engines myDir l ft txt =
     [ pico l ft txt
     , espeak l ft txt
-    , espeak_contrib l ft txt
+    , espeak_contrib myDir l ft txt
     ]
 
 oggenc :: FilePath -> FilePath -> (String, [String])
@@ -68,7 +69,7 @@ encoders :: FilePath -> FilePath -> [(String, [String])]
 encoders from to =
     [ oggenc from to
     , oggenc_contrib from to
-    ] 
+    ]
 
 tryPrograms [] e = e
 tryPrograms ((c,args):es) e = do
@@ -100,7 +101,9 @@ textToSpeech lang txt = do
     (tmp,h) <- openTempFile (takeDirectory fn) (takeBaseName fn <.> "wav")
     hClose h
 
-    tryPrograms (engines lang tmp txt) $ do
+    (myDir,_) <- splitExecutablePath
+
+    tryPrograms (engines myDir lang tmp txt) $ do
         putStrLn "No suitable text-to-speech-engine found."
         putStrLn "Do you have libttspico-utils or espeak installed?"
 

tttool.cabal

@@ -49,12 +49,13 @@ executable tttool
     KnownCodes,
     Types,
     Utils
-        
+
   build-depends:
     base        == 4.5.*   ||  == 4.6.*  ||  == 4.7.* ||  == 4.8.*,
     binary      == 0.5.*   ||  == 0.7.*,
     containers  == 0.4.*   ||  == 0.5.*,
     directory   == 1.2.*,
+    executable-path == 0.0.*,
     filepath    == 1.3.*   ||  == 1.4.*,
     template-haskell >= 2.7 && < 2.11,