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

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

diff --git a/src/Propellor/Server.hs b/src/Propellor/Server.hs
index 3fd34a5..77f7208 100644
--- a/src/Propellor/Server.hs
+++ b/src/Propellor/Server.hs
@@ -161,10 +161,10 @@ sendPrecompiled hn = void $ actionMessage ("Uploading locally compiled propellor
 		createDirectoryIfMissing True (tmpdir </> shimdir)
 		changeWorkingDirectory (tmpdir </> shimdir)
 		me <- readSymbolicLink "/proc/self/exe"
-		me' <- catchDefaultIO me (readSymbolicLink me)
-		shim <- Shim.setup me' "."
-		when (shim /= "propellor") $
-			renameFile shim "propellor"
+		createDirectoryIfMissing True "bin"
+		unlessM (boolSystem "cp" [File me, File "bin/propellor"]) $
+			errorMessage "failed copying in propellor"
+		void $ Shim.setup "bin/propellor" "."
 		changeWorkingDirectory tmpdir
 		withTmpFile "propellor.tar." $ \tarball _ -> allM id
 			[ boolSystem "strip" [File me]