From 81e52f1e14d92a455a873afc183aa9d4333876b4 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 22 Nov 2014 22:11:36 -0400 Subject: update --- .gitignore | 1 + src/Propellor/Spin.hs | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index e9925509..a2d84e4e 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ Setup Setup.hi Setup.o docker +propellor.1 diff --git a/src/Propellor/Spin.hs b/src/Propellor/Spin.hs index 228c4027..06bac330 100644 --- a/src/Propellor/Spin.hs +++ b/src/Propellor/Spin.hs @@ -224,7 +224,9 @@ sendPrecompiled hn = void $ actionMessage ("Uploading locally compiled propellor createDirectoryIfMissing True "bin" unlessM (boolSystem "cp" [File me, File "bin/propellor"]) $ errorMessage "failed copying in propellor" - void $ Shim.setup "bin/propellor" (localdir "bin/propellor") "." + let bin = "bin/propellor" + let binpath = Just $ localdir bin + void $ Shim.setup bin binpath "." changeWorkingDirectory tmpdir withTmpFile "propellor.tar." $ \tarball _ -> allM id [ boolSystem "strip" [File me] -- cgit v1.2.3