factor out string functions

most of these were copied from MissingH

3 files changed, 48 insertions, 40 deletions

diff --git a/fsmgr.cabal b/fsmgr.cabal
index 7f7708d..4d2de80 100644
--- a/fsmgr.cabal
+++ b/fsmgr.cabal
@@ -19,7 +19,7 @@ source-repository head
 
 library
   exposed-modules:
-      Crypto.Hash.Types.Digest.Read, ConfigFile
+      Crypto.Hash.Types.Digest.Read, ConfigFile, String
   other-modules:
       Paths_fsmgr
   hs-source-dirs:
diff --git a/fsmgr.hs b/fsmgr.hs
index 66bcaa8..770c8bc 100644
--- a/fsmgr.hs
+++ b/fsmgr.hs
@@ -27,56 +27,20 @@ import System.Directory     (getCurrentDirectory, createDirectoryIfMissing)
 import System.Posix.Process (getProcessID)
 import System.Posix.Types   (CUid (..))
 import System.Posix.User    (getEffectiveUserID)
+import String
 
 noParent :: BaseImageSpecification -> Bool
 noParent (EmptyImageOfBytes _)     = True
 noParent (ParentImageConfigFile _) = False
 
-split :: Eq a => [a] -> [a] -> [[a]]
-split _ [] = []
-split delim str =
-    let (firstline, remainder) = breakList (startswith delim) str
-        in
-        firstline : case remainder of
-                                   [] -> []
-                                   x -> if x == delim
-                                        then [] : []
-                                        else split delim
-                                                 (drop (length delim) x)
-
-spanList :: ([a] -> Bool) -> [a] -> ([a], [a])
-spanList _ [] = ([],[])
-spanList func list@(x:xs) =
-    if func list
-       then (x:ys,zs)
-       else ([],list)
-    where (ys,zs) = spanList func xs
-
-breakList :: ([a] -> Bool) -> [a] -> ([a], [a])
-breakList func = spanList (not . func)
-
-startswith :: Eq a => [a] -> [a] -> Bool
-startswith = isPrefixOf
-
-join :: [a] -> [[a]] -> [a]
-join delim l = concat (intersperse delim l)
-
-replace :: Eq a => [a] -> [a] -> [a] -> [a]
-replace old new l = join new . split old $ l
-
-wordsBy c s = words (rep <$> s)
-  where
-    rep x | x == c    = ' '
-          | otherwise = x
+dynamicNames :: FilePath -> FilePath
+dynamicNames = replace "$(karch)" uname
 
 uname :: String
 uname = unsafePerformIO $ do
   Stdout out <- cmd "uname -r"
   return $ last . wordsBy '-' . head . lines $ out
 
-dynamicNames :: FilePath -> FilePath
-dynamicNames = replace "$(karch)" uname
-
 buildRoot :: DiskImageConfig -> FilePath -> Action ()
 buildRoot config@DiskImageConfig{..} finalOut = do
   let out        = finalOut <.> "tmp"
diff --git a/src/String.hs b/src/String.hs
new file mode 100644
index 0000000..633c920
--- /dev/null
+++ b/src/String.hs
@@ -0,0 +1,44 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+
+module String where
+
+import           Rebase.Prelude hiding (bool, hash, join, o, (<.>))
+
+split :: Eq a => [a] -> [a] -> [[a]]
+split _ [] = []
+split delim str =
+    let (firstline, remainder) = breakList (startswith delim) str
+        in
+        firstline : case remainder of
+                                   [] -> []
+                                   x -> if x == delim
+                                        then [] : []
+                                        else split delim
+                                                 (drop (length delim) x)
+
+spanList :: ([a] -> Bool) -> [a] -> ([a], [a])
+spanList _ [] = ([],[])
+spanList func list@(x:xs) =
+    if func list
+       then (x:ys,zs)
+       else ([],list)
+    where (ys,zs) = spanList func xs
+
+breakList :: ([a] -> Bool) -> [a] -> ([a], [a])
+breakList func = spanList (not . func)
+
+startswith :: Eq a => [a] -> [a] -> Bool
+startswith = isPrefixOf
+
+join :: [a] -> [[a]] -> [a]
+join delim l = concat (intersperse delim l)
+
+replace :: Eq a => [a] -> [a] -> [a] -> [a]
+replace old new l = join new . split old $ l
+
+wordsBy :: Char -> [Char] -> [String]
+wordsBy c s = words (rep <$> s)
+  where
+    rep x | x == c    = ' '
+          | otherwise = x
+