summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2014-12-04 17:11:08 -0400
committerJoey Hess2014-12-04 17:11:08 -0400
commitcdf763b8b8deeb9c7e572afe268869e441ef30aa (patch)
tree9a3c372c5bee7c8942bb2fa5a08446e148a8539a
parent014af4a5b4a21185e16f7564be00859b3bc4c060 (diff)
propellor spin
-rw-r--r--src/Propellor/Property/Chroot/Util.hs7
-rw-r--r--src/Propellor/Property/OS.hs2
2 files changed, 5 insertions, 4 deletions
diff --git a/src/Propellor/Property/Chroot/Util.hs b/src/Propellor/Property/Chroot/Util.hs
index feb71d01..382fbab7 100644
--- a/src/Propellor/Property/Chroot/Util.hs
+++ b/src/Propellor/Property/Chroot/Util.hs
@@ -9,7 +9,8 @@ import Control.Applicative
standardPathEnv :: IO [(String, String)]
standardPathEnv = do
path <- getEnvDefault "PATH" "/bin"
- addEntry "PATH" (path ++ std)
+ addEntry "PATH" (path ++ stdPATH)
<$> getEnvironment
- where
- std = "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+
+stdPATH :: String
+stdPATH = "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
diff --git a/src/Propellor/Property/OS.hs b/src/Propellor/Property/OS.hs
index 14e5d85a..cbdb4d99 100644
--- a/src/Propellor/Property/OS.hs
+++ b/src/Propellor/Property/OS.hs
@@ -94,7 +94,7 @@ cleanInstallOnce confirmation = check (not <$> doesFileExist flagfile) $
let dest = "/" ++ takeFileName d
whenM (not <$> fileExist dest) $
rename d dest
- removeDirectory newOSDir
+ removeDirectoryRecursive newOSDir
return MadeChange
trickydirs =