From c7bc34d256604af8d2ed6444dfa2f4ce6402b682 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 21 Jul 2015 10:47:26 -0400 Subject: fix check for already existing shim Was not checking the shim file, oops. --- src/Propellor/Shim.hs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/Propellor/Shim.hs') diff --git a/src/Propellor/Shim.hs b/src/Propellor/Shim.hs index ecf9f36a..7cdecefd 100644 --- a/src/Propellor/Shim.hs +++ b/src/Propellor/Shim.hs @@ -20,7 +20,7 @@ import System.Posix.Files -- Propellor may be running from an existing shim, in which case it's -- simply reused. setup :: FilePath -> Maybe FilePath -> FilePath -> IO FilePath -setup propellorbin propellorbinpath dest = checkAlreadyShimmed propellorbin $ do +setup propellorbin propellorbinpath dest = checkAlreadyShimmed shim $ do createDirectoryIfMissing True dest libs <- parseLdd <$> readProcess "ldd" [propellorbin] @@ -39,7 +39,6 @@ setup propellorbin propellorbinpath dest = checkAlreadyShimmed propellorbin $ do fromMaybe (error "cannot find gconv directory") $ headMaybe $ filter ("/gconv/" `isInfixOf`) glibclibs let linkerparams = ["--library-path", intercalate ":" libdirs ] - let shim = file propellorbin dest writeFile shim $ unlines [ shebang , "GCONV_PATH=" ++ shellEscape gconvdir @@ -49,6 +48,8 @@ setup propellorbin propellorbinpath dest = checkAlreadyShimmed propellorbin $ do ] modifyFileMode shim (addModes executeModes) return shim + where + shim = file propellorbin dest shebang :: String shebang = "#!/bin/sh" -- cgit v1.2.3