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

1 files changed, 35 insertions, 24 deletions

diff --git a/fsmgr.hs b/fsmgr.hs
index a96bc1b..c290a74 100644
--- a/fsmgr.hs
+++ b/fsmgr.hs
@@ -1,33 +1,35 @@
-{-# LANGUAGE ViewPatterns          #-}
 {-# OPTIONS_GHC -fno-warn-type-defaults #-}
 {-# LANGUAGE DuplicateRecordFields #-}
 {-# LANGUAGE ExtendedDefaultRules  #-}
+{-# LANGUAGE FlexibleContexts      #-}
 {-# LANGUAGE LambdaCase            #-}
 {-# LANGUAGE NamedFieldPuns        #-}
 {-# LANGUAGE NoImplicitPrelude     #-}
 {-# LANGUAGE OverloadedStrings     #-}
 {-# LANGUAGE RecordWildCards       #-}
 {-# LANGUAGE ScopedTypeVariables   #-}
+{-# LANGUAGE ViewPatterns          #-}
 
 module Main where
-import Rebase.Prelude hiding (bool, hash, o, (<.>), join)
+import           Rebase.Prelude             hiding (bool, hash, join, o, (<.>))
 
-import qualified Rebase.Data.Text as Text
-         ;import Rebase.Data.Text (pack, unpack)
+import           Rebase.Data.Text           (pack, unpack)
+import qualified Rebase.Data.Text           as Text
 
-import Development.Shake          hiding (getEnv)
-import Development.Shake.Command  ()
-import Development.Shake.FilePath
+import           Development.Shake          hiding (getEnv)
+import           Development.Shake.Command  ()
+import           Development.Shake.FilePath
 
-import qualified Options.Applicative as Opt
-         ;import Options.Applicative hiding (action, command)
+import           Options.Applicative        hiding (action, command)
+import qualified Options.Applicative        as Opt
 
-import ConfigFile
-import System.Directory     (getCurrentDirectory, createDirectoryIfMissing)
-import System.Posix.Process (getProcessID)
-import System.Posix.Types   (CUid (..))
-import System.Posix.User    (getEffectiveUserID)
-import String
+import           ConfigFile
+import           String
+import           System.Directory           (createDirectoryIfMissing,
+                                             getCurrentDirectory)
+import           System.Posix.Process       (getProcessID)
+import           System.Posix.Types         (CUid (..))
+import           System.Posix.User          (getEffectiveUserID)
 
 noParent :: BaseImageSpecification -> Bool
 noParent (EmptyImageOfBytes _)     = True
@@ -36,10 +38,13 @@ noParent (ParentImageConfigFile _) = False
 dynamicNames :: FilePath -> FilePath
 dynamicNames = replace "$(karch)" uname . replace "$(debarch)" debarch
 
+chomp :: String -> String
+chomp = takeWhile (/= '\n')
+
 debarch :: String
 debarch = unsafePerformIO $ do
   Stdout out <- cmd "dpkg-architecture -q DEB_BUILD_ARCH"
-  return out
+  return $ chomp out
 
 uname :: String
 uname = unsafePerformIO $ do
@@ -76,15 +81,21 @@ buildRoot config@DiskImageConfig{..} finalOut = do
     {- 2.5. install apt package cache -}
     -- TODO
     {- 3. binaries -}
-    forM_ (unpack <$> binaries) $ \b -> do
-      p <- fromMaybe (fail $ "not found in ${PATH}: " ++ b) <$> liftIO (pathLocate b)
-      cmd_ "cp -L" [p] [mountpoint </> "usr/local/bin" </> b]
+    let go b = do
+          p <- fromMaybe (fail $ "not found in ${PATH}: " ++ b) <$> liftIO (pathLocate b)
+          cmd_ "cp -L" [p] [mountpoint </> "usr/local/bin" </> b]
+      in do
+        forM_ (unpack <$> binaries) go
+        forM_ (unpack <$> optionalBinaries) $ ignoreErrors . go
     {- 3.5 skel -}
-    forM_ (unpack <$> skelFiles) $ \f -> do
-      homeDir <- getHomeDir
-      target <- absPath mountpoint <&> (</> "etc/skel")
-      cmd_ "mkdir -p" [target]
-      cmd_ (Cwd homeDir) "cp -r --preserve=mode,timestamps -L --parents -t" [target] [f]
+    let go f = do
+          homeDir <- getHomeDir
+          target <- absPath mountpoint <&> (</> "etc/skel")
+          cmd_ "mkdir -p" [target]
+          cmd_ (Cwd homeDir) "cp -r --preserve=mode,timestamps -L --parents -t" [target] [f]
+      in do
+        forM_ (unpack <$> skelFiles) go
+        forM_ (unpack <$> optionalSkelFiles) $ ignoreErrors . go
     {- 4. custom setup commands -}
     forM_ chrootCommands $ \c -> do
       cmd_ "chroot" [mountpoint] "/bin/sh -c" [unpack c]