From f1fdd6f678d2d5d753407434a53cc6e2876185ae Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 22 Nov 2014 00:34:34 -0400
Subject: [PATCH] propellor spin

---
 src/Propellor/Server.hs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/Propellor/Server.hs b/src/Propellor/Server.hs
index d6987d2..a72c83a 100644
--- a/src/Propellor/Server.hs
+++ b/src/Propellor/Server.hs
@@ -128,13 +128,14 @@ sendPrecompiled hn = void $ actionMessage ("Uploading locally compiled propellor
 	cacheparams <- sshCachingParams hn
 	withTmpDir "propellor" $ \tmpdir ->
 		bracket getWorkingDirectory changeWorkingDirectory $ \_ -> do
-			changeWorkingDirectory tmpdir
 			let shimdir = "propellor"
+			changeWorkingDirectory shimdir
 			me <- readSymbolicLink "/proc/self/exe"
-			shim <- Shim.setup me shimdir
+			shim <- Shim.setup me "."
+			changeWorkingDirectory tmpdir
 			when (shim /= shimdir </> "propellor") $
 				renameFile shim (shimdir </> "propellor")
-			withTmpFile "propellor.tar" $ \tarball _ -> allM id
+			withTmpFile "propellor.tar." $ \tarball _ -> allM id
 				[ boolSystem "strip" [File me]
 				, boolSystem "tar" [Param "cf", File tarball, File shimdir]
 				, boolSystem "scp" $ cacheparams ++ [File tarball, Param ("root@"++hn++":"++remotetarball)]