summaryrefslogtreecommitdiff
path: root/src/Propellor
diff options
context:
space:
mode:
authorJoey Hess2014-11-22 17:16:25 -0400
committerJoey Hess2014-11-22 17:16:25 -0400
commitaa986724a2fa56aba0b8584deb33536d24d7f66d (patch)
tree02cbac007a628ffd0cb667ab9d80ab1ed95ea592 /src/Propellor
parenta527af06a55296fbcaa01ed9cb67b46b3e6db801 (diff)
propellor spin
Diffstat (limited to 'src/Propellor')
-rw-r--r--src/Propellor/Server.hs3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/Propellor/Server.hs b/src/Propellor/Server.hs
index be2eb1d3..3fd34a51 100644
--- a/src/Propellor/Server.hs
+++ b/src/Propellor/Server.hs
@@ -161,7 +161,8 @@ sendPrecompiled hn = void $ actionMessage ("Uploading locally compiled propellor
createDirectoryIfMissing True (tmpdir </> shimdir)
changeWorkingDirectory (tmpdir </> shimdir)
me <- readSymbolicLink "/proc/self/exe"
- shim <- Shim.setup me "."
+ me' <- catchDefaultIO me (readSymbolicLink me)
+ shim <- Shim.setup me' "."
when (shim /= "propellor") $
renameFile shim "propellor"
changeWorkingDirectory tmpdir