From 08b77f2a0a760a8ab1275e0100b8ebef290ad85a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 7 Mar 2016 17:16:00 -0400 Subject: minor style improvements Made some code a little faster.. --- src/Propellor/Property/FreeBSD/Pkg.hs | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'src/Propellor/Property') diff --git a/src/Propellor/Property/FreeBSD/Pkg.hs b/src/Propellor/Property/FreeBSD/Pkg.hs index ad9b5f24..1d6e1f68 100644 --- a/src/Propellor/Property/FreeBSD/Pkg.hs +++ b/src/Propellor/Property/FreeBSD/Pkg.hs @@ -71,15 +71,10 @@ upgrade = type Package = String installed :: Package -> Property NoInfo -installed pkg = - check (isInstallable pkg) $ pkgCmdProperty "install" [pkg] +installed pkg = check (isInstallable pkg) $ pkgCmdProperty "install" [pkg] isInstallable :: Package -> IO Bool -isInstallable p = do - l <- isInstalled p - e <- exists p - - return $ (not l) && e +isInstallable p = (not <$> isInstalled p) <&&> exists p isInstalled :: Package -> IO Bool isInstalled p = catch (runPkg "info" [p] >> return True) (\(_ :: IOError ) -> return False) -- cgit v1.2.3