Improved findLibDir to search in build/ihp-lib. Fixes #331

digitallyinduced · Aug 16, 2020 · 00be915 · 00be915
1 parent 37e5aab
commit 00be915
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/IHP/FrameworkConfig.hs b/IHP/FrameworkConfig.hs
@@ -69,8 +69,12 @@ appDatabaseUrl = do
 findLibDirectory :: IO Text
 findLibDirectory = do
     frameworkMountedLocally <- Directory.doesDirectoryExist "IHP"
+    ihpLibSymlinkAvailable <- Directory.doesDirectoryExist "build/ihp-lib"
     if frameworkMountedLocally
         then pure "IHP/lib/IHP/"
-        else do
-            binDir <- cs <$> Process.readCreateProcess (Process.shell "dirname $(which RunDevServer)") ""
-            pure (Text.strip binDir <> "/../lib/IHP/")
+        else if ihpLibSymlinkAvailable
+            then do
+                pure "build/ihp-lib/"
+            else do
+                binDir <- cs <$> Process.readCreateProcess (Process.shell "dirname $(which RunDevServer)") ""
+                pure (Text.strip binDir <> "/../lib/IHP/")