format

nalchevanidze · Jun 30, 2024 · 3cb2055 · 3cb2055
1 parent 960e28e
commit 3cb2055
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/hconf/src/HConf/Config/Build.hs b/hconf/src/HConf/Config/Build.hs
@@ -74,7 +74,6 @@ instance Check Build where
 checkPkgNames :: (FromConf m [PkgDir], Log m) => Maybe [PkgDir] -> m ()
 checkPkgNames ls = do
   known <- packages
-  log (show (known, ls))
   let unknown = maybeList ls \\ known
   unless (null unknown) (throwError ("unknown packages: " <> show unknown))
 

diff --git a/hconf/src/HConf/Core/PkgDir.hs b/hconf/src/HConf/Core/PkgDir.hs
@@ -15,16 +15,16 @@ where
 
 import Data.Aeson (FromJSON (..), ToJSON (toJSON))
 import Data.Aeson.Types (Value (..))
-import Data.List (dropWhileEnd)
 import Data.Text (intercalate)
 import HConf.Utils.Core (Msg (..), withString)
 import Relude hiding (Undefined, intercalate)
 import System.FilePath.Glob (glob)
 import System.FilePath.Posix
   ( joinPath,
     normalise,
-    splitFileName,
+    splitFileName, splitDirectories,
   )
+import Data.List (stripPrefix)
 
 data PkgDir = PkgDir
   { root :: Maybe FilePath,
@@ -58,7 +58,7 @@ cabalFile name = pkgFile (toString name <> ".cabal")
 
 resolveDir :: String -> Maybe String
 resolveDir "./" = Nothing
-resolveDir name = Just $ dropWhileEnd (/= '/') name
+resolveDir name = Just $ joinPath $ splitDirectories $ fromMaybe name (stripPrefix "./" name)
 
 parseDir :: FilePath -> PkgDir
 parseDir x =