implement 'binaries-optional:' and 'skel-files-optional:' sections

1 files changed, 19 insertions, 15 deletions

diff --git a/src/ConfigFile.hs b/src/ConfigFile.hs
index 086ac7c..bc5e254 100644
--- a/src/ConfigFile.hs
+++ b/src/ConfigFile.hs
@@ -8,15 +8,15 @@
 {-# LANGUAGE ScopedTypeVariables  #-}
 
 module ConfigFile where
-import Rebase.Prelude hiding (bool, hash, (<.>))
+import           Rebase.Prelude            hiding (bool, hash, (<.>))
 
-import Data.Yaml.Combinators
-import Development.Shake            hiding (getEnv)
-import Development.Shake.Command    ()
-import qualified Rebase.Data.Set    as Set
-import Rebase.Data.Text   (pack, unpack)
-import Rebase.Data.Text.Encoding
-import qualified Rebase.Data.Vector as Vector
+import           Data.Yaml.Combinators
+import           Development.Shake         hiding (getEnv)
+import           Development.Shake.Command ()
+import qualified Rebase.Data.Set           as Set
+import           Rebase.Data.Text          (pack, unpack)
+import           Rebase.Data.Text.Encoding
+import qualified Rebase.Data.Vector        as Vector
 {-
 
 Basic idea is to have a fs.yaml that specifies the build procedure. Analogous to
@@ -51,13 +51,15 @@ data BaseImageSpecification
   deriving (Show, Read)
 
 data DiskImageConfig = DiskImageConfig {
-  initialImage   :: BaseImageSpecification
-, packages       :: Set Package
-, debconfConfig  :: Maybe FilePath
-, unpackOnly     :: Bool
-, binaries       :: Vector Text
-, chrootCommands :: Vector Text
-, skelFiles      :: Vector Text
+  initialImage      :: BaseImageSpecification
+, packages          :: Set Package
+, debconfConfig     :: Maybe FilePath
+, unpackOnly        :: Bool
+, binaries          :: Vector Text
+, optionalBinaries  :: Vector Text
+, chrootCommands    :: Vector Text
+, skelFiles         :: Vector Text
+, optionalSkelFiles :: Vector Text
 } deriving (Show, Read)
 
 parsePackageName :: Text -> Package
@@ -71,8 +73,10 @@ diskImageConfigParser = object $
   <*> (fmap unpack <$> optField "debconf" string)
   <*> defaultField "unpack-only" False bool
   <*> defaultField "binaries" Vector.empty (array string)
+  <*> defaultField "binaries-optional" Vector.empty (array string)
   <*> defaultField "chroot-commands" Vector.empty (array string)
   <*> defaultField "skel-files" Vector.empty (array string)
+  <*> defaultField "skel-files-optional" Vector.empty (array string)
 
 readCfg :: FilePath -> Action DiskImageConfig
 readCfg yaml = either error id . parse diskImageConfigParser . encodeUtf8 . pack <$> readFile' yaml