Use data-files to load confer.lua

app/Main.hs

@@ -2,11 +2,13 @@ module Main where
 
 import Data.Function ((&))
 import Data.Map.Strict qualified as Map
+import Data.Version (showVersion)
 import Effectful
 import Effectful.Error.Static
 import Effectful.FileSystem
 import Options.Applicative
 import Options.Applicative.Types
+import Paths_confer (version)
 import System.IO
 import System.OsPath
 import System.OsPath qualified as OsPath
@@ -90,7 +92,13 @@ runOptions (Options dryRun configurationFile Deploy) = do
         & runSymlinkIO
 
 withInfo :: Parser a -> String -> ParserInfo a
-withInfo opts desc = info (helper <*> opts) $ progDesc desc
+withInfo opts desc =
+  info
+    ( simpleVersioner (showVersion version)
+        <*> helper
+        <*> opts
+    )
+    $ progDesc desc
 
 osPathOption :: ReadM OsPath
 osPathOption = maybeReader OsPath.encodeUtf

confer.cabal

@@ -17,7 +17,7 @@ extra-doc-files:
   doc/*.md
   README.md
 
-data-dir:        runtime/lua
+data-files:      runtime/lua/confer.lua
 tested-with:     GHC ==9.8.2
 
 flag development
@@ -71,6 +71,8 @@ library
     Confer.Config.Types
     Confer.Effect.Symlink
 
+  other-modules:   Paths_confer
+  autogen-modules: Paths_confer
   build-depends:
     , aeson
     , base
@@ -98,10 +100,13 @@ library
   hs-source-dirs:  src
 
 executable confer
-  import:         extensions
-  import:         ghc-options
-  import:         rts-options
-  main-is:        Main.hs
+  import:          extensions
+  import:          ghc-options
+  import:          rts-options
+  hs-source-dirs:  app
+  main-is:         Main.hs
+  other-modules:   Paths_confer
+  autogen-modules: Paths_confer
   build-depends:
     , base
     , confer
@@ -114,8 +119,6 @@ executable confer
   if flag(development)
     build-depends: placeholder
 
-  hs-source-dirs: app
-
 test-suite confer-test
   import:         extensions
   import:         ghc-options

src/Confer/Config/Evaluator.hs

@@ -5,6 +5,7 @@ module Confer.Config.Evaluator
 
 import Control.Monad (void)
 import Control.Placeholder
+import Data.Maybe (isNothing)
 import Data.Text (Text)
 import Data.Text qualified as Text
 import Data.Text.IO qualified as Text
@@ -19,7 +20,10 @@ import HsLua.Marshalling (Peeker, Result)
 import HsLua.Marshalling qualified as Lua
 import HsLua.Module.System qualified as Lua.System
 import HsLua.Packaging.Module qualified as Lua
+import Paths_confer (getDataFileName)
+import System.Directory qualified as Directory
 import System.IO (utf16le, utf8)
+import System.IO.Unsafe qualified as Unsafe
 import System.Info qualified as System
 import System.OsPath (OsPath)
 import System.OsPath qualified as OsPath
@@ -28,9 +32,6 @@ import System.OsPath.Encoding qualified as OsPath
 import Confer.API.Host qualified as API
 import Confer.API.User qualified as API
 import Confer.Config.Types
-import Data.Maybe (isNothing)
-import System.Directory qualified as Directory
-import System.IO.Unsafe qualified as Unsafe
 
 adjustConfiguration
   :: Text
@@ -58,8 +59,9 @@ loadConfiguration pathToConfigFile = do
   hostModule <- API.mkHostModule
   liftIO $ Lua.run $ do
     Lua.openlibs -- load the default Lua packages
-    liftIO $ Text.putStrLn "Loading \"./runtime/lua/confer.lua\""
-    Lua.dofile (Just "./runtime/lua/confer.lua")
+    conferLuaFilePath <- liftIO $ getDataFileName "runtime/lua/confer.lua"
+    liftIO $ Text.putStrLn $ "Loading " <> Text.pack conferLuaFilePath
+    Lua.dofile (Just conferLuaFilePath)
     Lua.setglobal "confer"
     Lua.registerModule Lua.System.documentedModule
     Lua.registerModule userModule