cadey
/
propellor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

propellor spin

This commit is contained in:
Joey Hess 2014-12-04 17:11:08 -04:00
parent 014af4a5b4
commit cdf763b8b8
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Propellor/Property/Chroot/Util.hs
View File

@ -9,7 +9,8 @@ import Control.Applicative
standardPathEnv :: IO [(String, String)] standardPathEnv :: IO [(String, String)]
standardPathEnv = do standardPathEnv = do
path <- getEnvDefault "PATH" "/bin" path <- getEnvDefault "PATH" "/bin"
addEntry "PATH" (path ++ std) addEntry "PATH" (path ++ stdPATH)
<$> getEnvironment <$> 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"

2
src/Propellor/Property/OS.hs
View File

@ -94,7 +94,7 @@ cleanInstallOnce confirmation = check (not <$> doesFileExist flagfile) $
let dest = "/" ++ takeFileName d let dest = "/" ++ takeFileName d
whenM (not <$> fileExist dest) $ whenM (not <$> fileExist dest) $
rename d dest rename d dest
removeDirectory newOSDir removeDirectoryRecursive newOSDir
return MadeChange return MadeChange
trickydirs = trickydirs =