summaryrefslogtreecommitdiff
path: root/Propellor/Property/User.hs
diff options
context:
space:
mode:
authorJoey Hess2014-04-13 02:28:40 -0400
committerJoey Hess2014-04-13 02:28:40 -0400
commitc97285a21ea0e392e8c63c1898ee2deeb34e99a0 (patch)
tree7f7dfd46b003b5e41ea566e9ecd44316ec12d6af /Propellor/Property/User.hs
parentc7830f4e669735bf46945592b315e7e367129888 (diff)
propellor spin
Diffstat (limited to 'Propellor/Property/User.hs')
-rw-r--r--Propellor/Property/User.hs8
1 files changed, 4 insertions, 4 deletions
diff --git a/Propellor/Property/User.hs b/Propellor/Property/User.hs
index 9d948834..8e7afd81 100644
--- a/Propellor/Property/User.hs
+++ b/Propellor/Property/User.hs
@@ -7,7 +7,7 @@ import Propellor
data Eep = YesReallyDeleteHome
accountFor :: UserName -> Property
-accountFor user = check (isNothing <$> homedir user) $ cmdProperty "adduser"
+accountFor user = check (isNothing <$> catchMaybeIO (homedir user)) $ cmdProperty "adduser"
[ "--disabled-password"
, "--gecos", ""
, user
@@ -16,7 +16,7 @@ accountFor user = check (isNothing <$> homedir user) $ cmdProperty "adduser"
-- | Removes user home directory!! Use with caution.
nuked :: UserName -> Eep -> Property
-nuked user _ = check (isJust <$> homedir user) $ cmdProperty "userdel"
+nuked user _ = check (isJust <$> catchMaybeIO (homedir user)) $ cmdProperty "userdel"
[ "-r"
, user
]
@@ -57,5 +57,5 @@ getPasswordStatus user = parse . words <$> readProcess "passwd" ["-S", user]
isLockedPassword :: UserName -> IO Bool
isLockedPassword user = (== LockedPassword) <$> getPasswordStatus user
-homedir :: UserName -> IO (Maybe FilePath)
-homedir user = catchMaybeIO $ homeDirectory <$> getUserEntryForName user
+homedir :: UserName -> IO FilePath
+homedir user = homeDirectory <$> getUserEntryForName user