summaryrefslogtreecommitdiff
path: root/src/Propellor/Property/Cmd.hs
diff options
context:
space:
mode:
authorJoey Hess2015-03-12 20:09:31 -0400
committerJoey Hess2015-03-12 20:09:31 -0400
commitbc60edb50a41a326e64ccd25a36ac27215ef4b9e (patch)
tree7e3849d123da0dda038d2f5e3d88025635beb444 /src/Propellor/Property/Cmd.hs
parent4f101f8560e29958b08306c86a1b8ca34e8a6a0c (diff)
parent9292cee1aa7967a0afe6d45f58a6d429d1b56b55 (diff)
Merge branch 'joeyconfig'
Conflicts: privdata.joey/privdata.gpg
Diffstat (limited to 'src/Propellor/Property/Cmd.hs')
-rw-r--r--src/Propellor/Property/Cmd.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Propellor/Property/Cmd.hs b/src/Propellor/Property/Cmd.hs
index 7fd189df..ae8238f5 100644
--- a/src/Propellor/Property/Cmd.hs
+++ b/src/Propellor/Property/Cmd.hs
@@ -40,6 +40,6 @@ scriptProperty script = cmdProperty "sh" ["-c", shellcmd]
-- | A property that can satisfied by running a series of shell commands,
-- as user (cd'd to their home directory).
userScriptProperty :: UserName -> [String] -> Property NoInfo
-userScriptProperty user script = cmdProperty "su" ["-c", shellcmd, user]
+userScriptProperty user script = cmdProperty "su" ["--shell", "/bin/sh", "-c", shellcmd, user]
where
shellcmd = intercalate " ; " ("set -e" : "cd" : script)