summaryrefslogtreecommitdiff
path: root/src/Propellor/Shim.hs
diff options
context:
space:
mode:
authorJoey Hess2015-01-06 19:07:40 -0400
committerJoey Hess2015-01-06 19:07:40 -0400
commit16a5f561f52f35f95a59976b5ee61d99945b0d55 (patch)
tree791803645efedbc481cafcd907d2bcf73c03d1af /src/Propellor/Shim.hs
parentf4a57ca27d2009b3069c6b33904d198e6aa73f79 (diff)
Merge Utiity modules from git-annex.
Except for a few that are using the other exception handling library, that propellor has not switched to yet.
Diffstat (limited to 'src/Propellor/Shim.hs')
-rw-r--r--src/Propellor/Shim.hs5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/Propellor/Shim.hs b/src/Propellor/Shim.hs
index a97bf5c8..da4c96eb 100644
--- a/src/Propellor/Shim.hs
+++ b/src/Propellor/Shim.hs
@@ -9,7 +9,6 @@ module Propellor.Shim (setup, cleanEnv, file) where
import Propellor
import Utility.LinuxMkLibs
import Utility.SafeCommand
-import Utility.Path
import Utility.FileMode
import Utility.FileSystemEncoding
@@ -34,7 +33,7 @@ setup propellorbin propellorbinpath dest = checkAlreadyShimmed propellorbin $ do
let linker = (dest ++) $
fromMaybe (error "cannot find ld-linux linker") $
headMaybe $ filter ("ld-linux" `isInfixOf`) libs'
- let gconvdir = (dest ++) $ parentDir $
+ let gconvdir = (dest ++) $ takeDirectory $
fromMaybe (error "cannot find gconv directory") $
headMaybe $ filter ("/gconv/" `isInfixOf`) glibclibs
let linkerparams = ["--library-path", intercalate ":" libdirs ]
@@ -75,5 +74,5 @@ installFile top f = do
createLink f dest `catchIO` (const copy)
where
copy = void $ boolSystem "cp" [Param "-a", Param f, Param dest]
- destdir = inTop top $ parentDir f
+ destdir = inTop top $ takeDirectory f
dest = inTop top f