summaryrefslogtreecommitdiff
path: root/src/Propellor
diff options
context:
space:
mode:
authorJoey Hess2014-11-22 20:42:20 -0400
committerJoey Hess2014-11-22 20:42:20 -0400
commit58b5de78020f65ec54ba3ddb20741d9bf9906ad6 (patch)
tree8aea810082a2c764186ca5e7b6ad98e41a193c0f /src/Propellor
parent44111583e1e248701fd42c739fc5870ef07d4882 (diff)
Revert "avoid removing whole localdir every time the precompiled tarball is uploaded"
This reverts commit 40bec41f569a73a8e95d9acf91f0ae7465b0f8c0.
Diffstat (limited to 'src/Propellor')
-rw-r--r--src/Propellor/Spin.hs5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/Propellor/Spin.hs b/src/Propellor/Spin.hs
index 1688bcaf..cffa7610 100644
--- a/src/Propellor/Spin.hs
+++ b/src/Propellor/Spin.hs
@@ -217,7 +217,7 @@ sendPrecompiled hn = void $ actionMessage ("Uploading locally compiled propellor
where
go tmpdir = do
cacheparams <- sshCachingParams hn
- let shimdir = takeFileName localdir </> "shim"
+ let shimdir = takeFileName localdir
createDirectoryIfMissing True (tmpdir </> shimdir)
changeWorkingDirectory (tmpdir </> shimdir)
me <- readSymbolicLink "/proc/self/exe"
@@ -237,10 +237,9 @@ sendPrecompiled hn = void $ actionMessage ("Uploading locally compiled propellor
unpackcmd = shellWrap $ intercalate " && "
[ "cd " ++ takeDirectory remotetarball
- , "rm -rf " ++ localdir </> "shim"
+ , "rm -rf " ++ localdir
, "tar xzf " ++ remotetarball
, "rm -f " ++ remotetarball
- , "ln -sf shim/propellor propellor/propellor"
]
-- Shim for git push over the propellor ssh channel.