summaryrefslogtreecommitdiff
path: root/src/Propellor/Property/SiteSpecific/GitHome.hs
diff options
context:
space:
mode:
authorSean Whitton2017-11-19 12:04:26 -0700
committerSean Whitton2017-11-19 12:04:26 -0700
commit05e5308ee7cef99b24b4f9d9755e5488f8d92a39 (patch)
tree256b8f20bddf0f0701a3247228f9c2dd77be6e64 /src/Propellor/Property/SiteSpecific/GitHome.hs
parent38d039310e4db6ffaf5c8ca51c339421e6865eff (diff)
parent12beba0367d14f9c52adf72dd36e9cf5a8e35761 (diff)
Merge branch 'master' of https://git.joeyh.name/git/propellor into sbuild-overhaul
Diffstat (limited to 'src/Propellor/Property/SiteSpecific/GitHome.hs')
-rw-r--r--src/Propellor/Property/SiteSpecific/GitHome.hs9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/Propellor/Property/SiteSpecific/GitHome.hs b/src/Propellor/Property/SiteSpecific/GitHome.hs
index f14b5f12..2a66d1e2 100644
--- a/src/Propellor/Property/SiteSpecific/GitHome.hs
+++ b/src/Propellor/Property/SiteSpecific/GitHome.hs
@@ -20,7 +20,14 @@ installedFor user@(User u) = check (not <$> hasGitDir user) $
moveout tmpdir home
, property "rmdir" $ makeChange $ void $
catchMaybeIO $ removeDirectory tmpdir
- , userScriptProperty user ["rm -rf .aptitude/ .bashrc .profile; bin/mr checkout; bin/fixups"]
+ , userScriptProperty user ["rm -rf .aptitude/ .bashrc .profile"]
+ `assume` MadeChange
+ -- Set HOSTNAME so that this sees the right
+ -- hostname when run in a chroot with a different
+ -- hostname than the current one.
+ , userScriptProperty user ["HOSTNAME=$(cat /etc/hostname) bin/mr checkout"]
+ `assume` MadeChange
+ , userScriptProperty user ["bin/fixups"]
`assume` MadeChange
]
moveout tmpdir home = do