diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-01-06 18:29:07 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-01-06 18:55:56 -0400 |
| commit | 2bba5bc22d049272d3328bfa6c452d3e2e50e86c (patch) | |
| tree | 19feab50e43dc330038224ea98b371916ca02133 /Build/LinuxMkLibs.hs | |
| parent | 014e909a449d0822eff4962a504d6a524abe8fc7 (diff) | |
made parentDir return a Maybe FilePath; removed most uses of it
parentDir is less safe than takeDirectory, especially when working
with relative FilePaths. It's really only useful in loops that
want to terminate at /
This commit was sponsored by Audric SCHILTKNECHT.
Diffstat (limited to 'Build/LinuxMkLibs.hs')
| -rw-r--r-- | Build/LinuxMkLibs.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Build/LinuxMkLibs.hs b/Build/LinuxMkLibs.hs index 1ca2fa651..f3a7c3b2e 100644 --- a/Build/LinuxMkLibs.hs +++ b/Build/LinuxMkLibs.hs @@ -47,7 +47,7 @@ mklibs top = do writeFile (top </> "linker") (Prelude.head $ filter ("ld-linux" `isInfixOf`) libs') writeFile (top </> "gconvdir") - (parentDir $ Prelude.head $ filter ("/gconv/" `isInfixOf`) glibclibs) + (takeDirectory $ Prelude.head $ filter ("/gconv/" `isInfixOf`) glibclibs) mapM_ (installLinkerShim top) exes @@ -75,7 +75,7 @@ installLinkerShim top exe = do symToHardLink :: FilePath -> IO () symToHardLink f = whenM (isSymbolicLink <$> getSymbolicLinkStatus f) $ do l <- readSymbolicLink f - let absl = absPathFrom (parentDir f) l + let absl = absPathFrom (takeDirectory f) l nukeFile f createLink absl f @@ -84,7 +84,7 @@ installFile top f = do createDirectoryIfMissing True destdir void $ copyFileExternal CopyTimeStamps f destdir where - destdir = inTop top $ parentDir f + destdir = inTop top $ takeDirectory f checkExe :: FilePath -> IO Bool checkExe f |