diff options
| author | Joey Hess <joey@kitenet.net> | 2014-11-22 22:10:53 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-11-22 22:10:53 -0400 |
| commit | 96ecbaad25076901802dd7a311161d46a1212d68 (patch) | |
| tree | 74f5b4aa02aa384c4fd5470076d24a4e89ed17a7 /src/Propellor/Shim.hs | |
| parent | 7c5188b202977d341bdfae504c987e8ee0451157 (diff) | |
pute full path to bin/propellor inside shim
Diffstat (limited to 'src/Propellor/Shim.hs')
| -rw-r--r-- | src/Propellor/Shim.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Propellor/Shim.hs b/src/Propellor/Shim.hs index 6262ea5c..a97bf5c8 100644 --- a/src/Propellor/Shim.hs +++ b/src/Propellor/Shim.hs @@ -21,8 +21,8 @@ import System.Posix.Files -- -- Propellor may be running from an existing shim, in which case it's -- simply reused. -setup :: FilePath -> FilePath -> IO FilePath -setup propellorbin dest = checkAlreadyShimmed propellorbin $ do +setup :: FilePath -> Maybe FilePath -> FilePath -> IO FilePath +setup propellorbin propellorbinpath dest = checkAlreadyShimmed propellorbin $ do createDirectoryIfMissing True dest libs <- parseLdd <$> readProcess "ldd" [propellorbin] @@ -44,7 +44,7 @@ setup propellorbin dest = checkAlreadyShimmed propellorbin $ do , "GCONV_PATH=" ++ shellEscape gconvdir , "export GCONV_PATH" , "exec " ++ unwords (map shellEscape $ linker : linkerparams) ++ - " " ++ shellEscape propellorbin ++ " \"$@\"" + " " ++ shellEscape (fromMaybe propellorbin propellorbinpath) ++ " \"$@\"" ] modifyFileMode shim (addModes executeModes) return shim |